diff options
| author | Victoria Lease <violets@google.com> | 2012-11-07 14:01:41 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-07 14:01:41 -0800 |
| commit | eb6cbc22b264af26a20065942899a27abbc867eb (patch) | |
| tree | 573694e516e997010d9c7c535b4377d4ac2a9881 | |
| parent | 8e3bf41d8b2289fa96ea1b268946bacaa01a620c (diff) | |
| parent | ad84f7f46b0207a7ad316b4df37c1f02c889cca9 (diff) | |
| download | frameworks_base-eb6cbc22b264af26a20065942899a27abbc867eb.zip frameworks_base-eb6cbc22b264af26a20065942899a27abbc867eb.tar.gz frameworks_base-eb6cbc22b264af26a20065942899a27abbc867eb.tar.bz2 | |
am ad84f7f4: Merge "disable geofences for secondary users" into jb-mr1-dev
* commit 'ad84f7f46b0207a7ad316b4df37c1f02c889cca9':
disable geofences for secondary users
| -rw-r--r-- | services/java/com/android/server/LocationManagerService.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/services/java/com/android/server/LocationManagerService.java b/services/java/com/android/server/LocationManagerService.java index 9416b52..2290505 100644 --- a/services/java/com/android/server/LocationManagerService.java +++ b/services/java/com/android/server/LocationManagerService.java @@ -1351,6 +1351,11 @@ public class LocationManagerService extends ILocationManager.Stub implements Run // geo-fence manager uses the public location API, need to clear identity int uid = Binder.getCallingUid(); + if (UserHandle.getUserId(uid) != UserHandle.USER_OWNER) { + // temporary measure until geofences work for secondary users + Log.w(TAG, "proximity alerts are currently available only to the primary user"); + return; + } long identity = Binder.clearCallingIdentity(); try { mGeofenceManager.addFence(sanitizedRequest, geofence, intent, uid, packageName); |