summaryrefslogtreecommitdiff
path: root/services/java/com/android/server/LocationManagerService.java
diff options
context:
space:
mode:
authorVictoria Lease <violets@google.com>2013-05-07 14:22:02 -0700
committerVictoria Lease <violets@google.com>2013-05-07 15:30:28 -0700
commitd9ba79ed7c898aa60ee3c5196439d9bac6cbbb59 (patch)
treefe8a2c09091644b5257df2ee8214463de3a3af1b /services/java/com/android/server/LocationManagerService.java
parente2322bdd7865552aa31f93bbf4e60d4d9a7d0973 (diff)
OO NOT MERGE allow connected location providers location access
Cherry-pick of I0c383eb82ed041e57a7d32321df2d67b462d4e21 from master Oops, it seems the fused location provider was being denied access to locations when any user other than the primary device owner is logged in. This was breaking the fused location provider entirely for all secondary users of a given device. Bug: 8766225 Change-Id: Ic0db5f2094828c897a405abb0dca6ac39a2ca526
Diffstat (limited to 'services/java/com/android/server/LocationManagerService.java')
-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 26753094a978..142357d4e875 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: " +