Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 63fd43ba authored by Victoria Lease's avatar Victoria Lease Committed by Android Git Automerger
Browse files

am bf328b40: am 4abe2d3d: am ad84f7f4: Merge "disable geofences for secondary... 

am bf328b40: am 4abe2d3d: am ad84f7f4: Merge "disable geofences for secondary users" into jb-mr1-dev

* commit 'bf328b40':
  disable geofences for secondary users
parents 7f83ef61 bf328b40

services/java/com/android/server/LocationManagerService.java

+5 −0
Original line number Diff line number Diff line
@@ -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);