Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 2b7a0d00: Fix addGeofence() and addProximityAlert().

Browse Source 
* commit '2b7a0d00426218523629e4e8dd2e9197d445c09b':
  Fix addGeofence() and addProximityAlert().
This commit is contained in:
Nick Pelly
2012-08-17 15:38:00 -07:00
committed by Android Git Automerger
parent a44590f3f9 2b7a0d0042
commit 5dd7b11eb2
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
services/java/com/android/server/LocationManagerService.java
View File

@@ -968,7 +968,7 @@ public class LocationManagerService extends ILocationManager.Stub implements Obs
final int uid = Binder.getCallingUid(); final int uid = Binder.getCallingUid();
Receiver recevier = checkListenerOrIntent(listener, intent, pid, uid, packageName); Receiver recevier = checkListenerOrIntent(listener, intent, pid, uid, packageName);
// so wakelock calls will succeed (not totally sure this is still needed) // providers may use public location API's, need to clear identity
long identity = Binder.clearCallingIdentity(); long identity = Binder.clearCallingIdentity();
try { try {
synchronized (mLock) { synchronized (mLock) {
@@ -1018,7 +1018,7 @@ public class LocationManagerService extends ILocationManager.Stub implements Obs
final int uid = Binder.getCallingUid(); final int uid = Binder.getCallingUid();
Receiver receiver = checkListenerOrIntent(listener, intent, pid, uid, packageName); Receiver receiver = checkListenerOrIntent(listener, intent, pid, uid, packageName);
// so wakelock calls will succeed (not totally sure this is still needed) // providers may use public location API's, need to clear identity
long identity = Binder.clearCallingIdentity(); long identity = Binder.clearCallingIdentity();
try { try {
synchronized (mLock) { synchronized (mLock) {
@@ -1107,7 +1107,14 @@ public class LocationManagerService extends ILocationManager.Stub implements Obs
if (D) Log.d(TAG, "requestGeofence: " + request + " " + geofence + " " + intent); if (D) Log.d(TAG, "requestGeofence: " + request + " " + geofence + " " + intent);
mGeofenceManager.addFence(request, geofence, intent, Binder.getCallingUid(), packageName); // geo-fence manager uses the public location API, need to clear identity
int uid = Binder.getCallingUid();
long identity = Binder.clearCallingIdentity();
try {
mGeofenceManager.addFence(request, geofence, intent, uid, packageName);
} finally {
Binder.restoreCallingIdentity(identity);
}
} }
@Override @Override
@@ -1118,7 +1125,13 @@ public class LocationManagerService extends ILocationManager.Stub implements Obs
if (D) Log.d(TAG, "removeGeofence: " + geofence + " " + intent); if (D) Log.d(TAG, "removeGeofence: " + geofence + " " + intent);
mGeofenceManager.removeFence(geofence, intent); // geo-fence manager uses the public location API, need to clear identity
long identity = Binder.clearCallingIdentity();
try {
mGeofenceManager.removeFence(geofence, intent);
} finally {
Binder.restoreCallingIdentity(identity);
}
} }