From 01ed75c82f29b883144d498b4a6a1414d4227a31 Mon Sep 17 00:00:00 2001
From: Nick Pelly <npelly@google.com>
Date: Wed, 13 Jun 2012 16:45:27 -0700
Subject: [PATCH] Fix NPE when public API removeProximityAlert() used before
 addProximityAlert().

Bug: 6313992
Change-Id: I905ad9ea771286727ce4a3a2334f2a0dac967c3d
---
 services/java/com/android/server/LocationManagerService.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/services/java/com/android/server/LocationManagerService.java b/services/java/com/android/server/LocationManagerService.java
index 985249d8d6bc..2918dbcdb635 100644
--- 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;
         }
-- 
2.11.0