commit 8fff6451476334fbef30a080f46f37d552257e9a
author Sean Foy <sean.foy@gmail.com> Thu Mar 04 12:17:54 2010 -0600
committer Mike Lockwood <lockwood@android.com> Thu Mar 04 21:05:51 2010 -0500
tree 069c2d014aa3a9cc8373473bebd1f7430fc3bc76
parent 1a31ae34a073b9769775f9e6cf5818888173a8e8

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

Change-Id: Ifcd3fa9c34cfca02ed5e7a94aded33984ac81c60
Signed-off-by: Mike Lockwood <lockwood@android.com>

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

diff --git a/services/java/com/android/server/LocationManagerService.java b/services/java/com/android/server/LocationManagerService.java
index eaf4802..8d00deb 100644
--- a/services/java/com/android/server/LocationManagerService.java
+++ b/services/java/com/android/server/LocationManagerService.java
@@ -1205,8 +1205,9 @@
             // 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);
                 }
             }
         }