am ad84f7f: Merge "disable geofences for secondary users" into jb-mr1-dev

* commit 'ad84f7f46b0207a7ad316b4df37c1f02c889cca9':
  disable geofences for secondary users

Author: Victoria Lease

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

@@ -1351,6 +1351,11 @@ public void requestGeofence(LocationRequest request, Geofence geofence, PendingI
 
         // 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);