diff options
| author | Mike Lockwood <lockwood@google.com> | 2010-03-04 18:32:37 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-03-04 18:32:37 -0800 |
| commit | ab2628c23dcddb0a954ae09d7fd8c4e3f77e9b9d (patch) | |
| tree | 3724b33948e17820976cd0372d376ed5dde1153a | |
| parent | 51ced540994ca032d886288c204091073c3fd66d (diff) | |
| parent | 8fff6451476334fbef30a080f46f37d552257e9a (diff) | |
| download | frameworks_base-ab2628c23dcddb0a954ae09d7fd8c4e3f77e9b9d.zip frameworks_base-ab2628c23dcddb0a954ae09d7fd8c4e3f77e9b9d.tar.gz frameworks_base-ab2628c23dcddb0a954ae09d7fd8c4e3f77e9b9d.tar.bz2 | |
Merge "Remove the ProximityAlerts update Receiver when the last ProximityAlert expires. Fixes issue 6900."
| -rw-r--r-- | services/java/com/android/server/LocationManagerService.java | 3 |
1 files changed, 2 insertions, 1 deletions
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 @@ 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); } } } |