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

2012-06-14 08:34:12 -07:00
parent a1d40e47f6 01ed75c82f
commit bfd125a0bf
1 changed files with 3 additions and 1 deletions
--- a/services/java/com/android/server/LocationManagerService.java
+++ b/services/java/com/android/server/LocationManagerService.java
@@ -1702,7 +1702,9 @@ public class LocationManagerService extends ILocationManager.Stub implements Run

        mProximityAlerts.remove(intent);
        if (mProximityAlerts.size() == 0) {
-            removeUpdatesLocked(mProximityReceiver);
+            if (mProximityReceiver != null) {
+                removeUpdatesLocked(mProximityReceiver);
+            }
            mProximityReceiver = null;
            mProximityListener = null;
        }