LocationManagerService: Fix bug removing proximity alerts.

mikeandroid · mikeandroid · commit 19563cc27844 · 2010-01-19T11:50:13.000-05:00
Alerts were not being removed from the mProximitiesEntered array.

Signed-off-by: Mike Lockwood &lt;lockwood@android.com&gt;
diff --git a/services/java/com/android/server/LocationManagerService.java b/services/java/com/android/server/LocationManagerService.java
@@ -1204,12 +1204,10 @@ public void onLocationChanged(Location loc) {
             // 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.

Original file line number	Diff line number	Diff line change
`@@ -1204,12 +1204,10 @@ public void onLocationChanged(Location loc) {`
`1204`	`1204`	`// Remove expired alerts`
`1205`	`1205`	`if (intentsToRemove != null) {`
`1206`	`1206`	`for (PendingIntent i : intentsToRemove) {`
`1207`		`- mProximityAlerts.remove(i);`
`1208`		`- ProximityAlert alert = mProximityAlerts.get(i);`
	`1207`	`+ ProximityAlert alert = mProximityAlerts.remove(i);`
`1209`	`1208`	`mProximitiesEntered.remove(alert);`
`1210`	`1209`	`}`
`1211`	`1210`	`}`
`1212`		`-`
`1213`	`1211`	`}`
`1214`	`1212`
`1215`	`1213`	`// Note: this is called with the lock held.`