diff options
| author | David van Tonder <david.vantonder@gmail.com> | 2013-07-04 17:06:45 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2013-07-04 17:06:45 -0700 |
| commit | 12a6a98f4c5a96081afc4b9e171fa8817982640d (patch) | |
| tree | 2564046b7e9f3f73dea0b97542bc63e36cdbf401 /services/java/com | |
| parent | 71e084350ea0e4fc780ef485607a61299da7c4d6 (diff) | |
| parent | 0f166de3b0555041fb4a49b4e319d3ffedf892a8 (diff) | |
| download | frameworks_base-12a6a98f4c5a96081afc4b9e171fa8817982640d.zip frameworks_base-12a6a98f4c5a96081afc4b9e171fa8817982640d.tar.gz frameworks_base-12a6a98f4c5a96081afc4b9e171fa8817982640d.tar.bz2 | |
Merge "Don't enable GPS if the requesting app is blacklisted." into cm-10.1
Diffstat (limited to 'services/java/com')
| -rw-r--r-- | services/java/com/android/server/LocationManagerService.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/java/com/android/server/LocationManagerService.java b/services/java/com/android/server/LocationManagerService.java index 0f08c56..86a577c 100644 --- a/services/java/com/android/server/LocationManagerService.java +++ b/services/java/com/android/server/LocationManagerService.java @@ -982,7 +982,8 @@ public class LocationManagerService extends ILocationManager.Stub implements Run if (records != null) { for (UpdateRecord record : records) { - if (UserHandle.getUserId(record.mReceiver.mUid) == mCurrentUserId) { + if (UserHandle.getUserId(record.mReceiver.mUid) == mCurrentUserId && + !mBlacklist.isBlacklisted(record.mReceiver.mPackageName)) { LocationRequest locationRequest = record.mRequest; providerRequest.locationRequests.add(locationRequest); if (locationRequest.getInterval() < providerRequest.interval) { |