summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Mike Lockwood <lockwood@android.com> 2010-01-19 11:48:14 -0500
committer Mike Lockwood <lockwood@android.com> 2010-01-19 14:00:48 -0500
commit0dac8c0f7ec00d94b09f92823fa238142163aba8 (patch)
treea4d486e209d4de080ba95a740a5d90721b02d8ed
parent97d1195832829905b07b7680b73bed8af959f430 (diff)
LocationManagerService: Fix bug removing proximity alerts.
Alerts were not being removed from the mProximitiesEntered array. Signed-off-by: Mike Lockwood <lockwood@android.com>
-rw-r--r--services/java/com/android/server/LocationManagerService.java4
1 files changed, 1 insertions, 3 deletions
diff --git a/services/java/com/android/server/LocationManagerService.java b/services/java/com/android/server/LocationManagerService.java
index 406897d7aeaa..1c82c94e77ae 100644
--- a/services/java/com/android/server/LocationManagerService.java
+++ b/services/java/com/android/server/LocationManagerService.java
@@ -1203,12 +1203,10 @@ public class LocationManagerService extends ILocationManager.Stub implements Run
// Remove expired alerts
if (intentsToRemove != null) {
for (PendingIntent i : intentsToRemove) {
- mProximityAlerts.remove(i);
- ProximityAlert alert = mProximityAlerts.get(i);
+ ProximityAlert alert = mProximityAlerts.remove(i);
mProximitiesEntered.remove(alert);
}
}
-
}
// Note: this is called with the lock held.