commit 26abeae75baa471fa7c8d686083c2f12f3246968
author Sean Foy <sean.foy@gmail.com> Thu Mar 04 12:17:54 2010 -0600
committer Jean-Baptiste Queru <jbq@google.com> Tue May 11 14:24:26 2010 -0700
tree f513108e5775fc082c931d0673326a18e6b46e42
parent 80131e4b9b3857ab7b72ac5103d2bd7e5d2d6aa1

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

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