From 26abeae75baa471fa7c8d686083c2f12f3246968 Mon Sep 17 00:00:00 2001
From: Sean Foy <sean.foy@gmail.com>
Date: Thu, 4 Mar 2010 12:17:54 -0600
Subject: [PATCH] Remove ProximityAlerts Receiver when last ProximityAlert
 expires.

Remove the ProximityAlerts update Receiver when the last ProximityAlert expires.
Fixes issue 6900.

Change-Id: Ida1970c084e71df47b204c64986a065cb75d0c13
---
 services/java/com/android/server/LocationManagerService.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/java/com/android/server/LocationManagerService.java b/services/java/com/android/server/LocationManagerService.java
index e39da8cc9581c..d679a5e97616a 100644
--- a/services/java/com/android/server/LocationManagerService.java
+++ b/services/java/com/android/server/LocationManagerService.java
@@ -1202,8 +1202,9 @@ public class LocationManagerService extends ILocationManager.Stub implements Run
             // Remove expired alerts
             if (intentsToRemove != null) {
                 for (PendingIntent i : intentsToRemove) {
-                    ProximityAlert alert = mProximityAlerts.remove(i);
+                    ProximityAlert alert = mProximityAlerts.get(i);
                     mProximitiesEntered.remove(alert);
+                    removeProximityAlertLocked(i);
                 }
             }
         }