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

am bfd125a0: Merge "Fix NPE when public API removeProximityAlert() used before addProximityAlert()." into jb-dev

Browse Source 
* commit 'bfd125a0bf51ce0931d981d7694432868b9f511f':
  Fix NPE when public API removeProximityAlert() used before addProximityAlert().
This commit is contained in:
Nick Pelly
2012-06-14 08:36:30 -07:00
committed by Android Git Automerger
parent 544a0fc170 bfd125a0bf
commit da58f39374
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1702,7 +1702,9 @@ public class LocationManagerService extends ILocationManager.Stub implements Run
mProximityAlerts.remove(intent); mProximityAlerts.remove(intent);
if (mProximityAlerts.size() == 0) { if (mProximityAlerts.size() == 0) {
removeUpdatesLocked(mProximityReceiver); if (mProximityReceiver != null) {
removeUpdatesLocked(mProximityReceiver);
}
mProximityReceiver = null; mProximityReceiver = null;
mProximityListener = null; mProximityListener = null;
} }