summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictoria Lease <violets@google.com>2013-05-08 14:40:15 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-05-08 14:40:15 +0000
commitacd341d8682ca57c1066d664725ebc72f5ef10c1 (patch)
treef391c55b8d51c0d840e03890710279f449af211f
parentd28653df6580b76559374580764aa2e86d6c2f48 (diff)
parentd9ba79ed7c898aa60ee3c5196439d9bac6cbbb59 (diff)
downloadframeworks_base-acd341d8682ca57c1066d664725ebc72f5ef10c1.zip
frameworks_base-acd341d8682ca57c1066d664725ebc72f5ef10c1.tar.gz
frameworks_base-acd341d8682ca57c1066d664725ebc72f5ef10c1.tar.bz2
Merge "OO NOT MERGE allow connected location providers location access" into jb-mr2-dev
-rw-r--r--services/java/com/android/server/LocationManagerService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/LocationManagerService.java b/services/java/com/android/server/LocationManagerService.java
index 2675309..142357d 100644
--- a/services/java/com/android/server/LocationManagerService.java
+++ b/services/java/com/android/server/LocationManagerService.java
@@ -1798,7 +1798,7 @@ public class LocationManagerService extends ILocationManager.Stub {
boolean receiverDead = false;
int receiverUserId = UserHandle.getUserId(receiver.mUid);
- if (receiverUserId != mCurrentUserId) {
+ if (receiverUserId != mCurrentUserId && !isUidALocationProvider(receiver.mUid)) {
if (D) {
Log.d(TAG, "skipping loc update for background user " + receiverUserId +
" (current user: " + mCurrentUserId + ", app: " +