Remove ProximityAlerts Receiver when last ProximityAlert expires.

Remove the ProximityAlerts update Receiver when the last ProximityAlert expires. Fixes issue 6900. Change-Id: Ida1970c084e71df47b204c64986a065cb75d0c13
2010-03-04 12:17:54 -06:00
parent 80131e4b9b
commit 26abeae75b
1 changed files with 2 additions and 1 deletions
--- 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);
                }
            }
        }