OSDN Git Service

Merge "Update location AppOp monitoring to respect settings. If a provider is disable...
authorDavid Christie <dnchrist@google.com>
Wed, 14 Aug 2013 00:07:58 +0000 (00:07 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 14 Aug 2013 00:07:58 +0000 (00:07 +0000)
commitb5eaf2662c174a7f5844bc62eba4f09dd64877f7
treef52b9f0f9a3f73f68da27ec4c6afbdfd164a855c
parent5c7e64609c4de93cd70c2cbe238a5fc3ff3c6078
parent15b3191f913091e686e9e1f3708b7f8240a07e8b
Merge "Update location AppOp monitoring to respect settings. If a provider is disabled, we don't mark an app as actively using location just because it's requested that provider.  Also updates the concept of high power to support third party custom providers (doesn't hard code gps but looks at the provider's actual stated power requirement)." into klp-dev
services/java/com/android/server/LocationManagerService.java