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

Author: Nick Pelly

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

@@ -1702,7 +1702,9 @@ private void removeProximityAlertLocked(PendingIntent intent) {
 
         mProximityAlerts.remove(intent);
         if (mProximityAlerts.size() == 0) {
-            removeUpdatesLocked(mProximityReceiver);
+            if (mProximityReceiver != null) {
+                removeUpdatesLocked(mProximityReceiver);
+            }
             mProximityReceiver = null;
             mProximityListener = null;
         }