Merge change 10327

Android Code Review · Android Code Review · commit 75c567a8dc16 · 2009-06-10T17:03:05.000-07:00
* changes: Logical error. If multiple receivers are dead, only the first one will be added. found in http://code.google.com/p/android/issues/detail?id=2651
diff --git a/services/java/com/android/server/LocationManagerService.java b/services/java/com/android/server/LocationManagerService.java
@@ -836,8 +836,8 @@ private void updateProviderListenersLocked(String provider, boolean enabled) {
                         } catch (PendingIntent.CanceledException e) {
                             if (deadReceivers == null) {
                                 deadReceivers = new ArrayList<Receiver>();
-                                deadReceivers.add(receiver);
                             }
+                            deadReceivers.add(receiver);
                         }
                     }
                 } catch (RemoteException e) {

Original file line number	Diff line number	Diff line change
`@@ -836,8 +836,8 @@ private void updateProviderListenersLocked(String provider, boolean enabled) {`
`836`	`836`	`} catch (PendingIntent.CanceledException e) {`
`837`	`837`	`if (deadReceivers == null) {`
`838`	`838`	`deadReceivers = new ArrayList<Receiver>();`
`839`		`- deadReceivers.add(receiver);`
`840`	`839`	`}`
	`840`	`+ deadReceivers.add(receiver);`
`841`	`841`	`}`
`842`	`842`	`}`
`843`	`843`	`} catch (RemoteException e) {`