commit 911bd0d3a587a9a58e2bc1cf59615b039ea0e5b2
author Wale Ogunwale <ogunwale@google.com> Tue Aug 04 00:33:48 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 04 00:33:48 2015 +0000
tree 716b451b1677027b466450fd581b99555199ea05
parent c03ab87ac9f721ff22bfe5e9c0cd0e5be64f261e
parent 9a6e13c347df85348db8c0af67eeaa558fd61ee9

Merge "Set broadcast nextReceiver correctly when package is disabled" into mnc-dev

services/core/java/com/android/server/am/BroadcastRecord.java

diff --git a/services/core/java/com/android/server/am/BroadcastRecord.java b/services/core/java/com/android/server/am/BroadcastRecord.java
index a7e6471..1fbfd9f 100644
--- a/services/core/java/com/android/server/am/BroadcastRecord.java
+++ b/services/core/java/com/android/server/am/BroadcastRecord.java
@@ -240,8 +240,12 @@
                 }
                 didSomething = true;
                 receivers.remove(i);
+                if (i < nextReceiver) {
+                    nextReceiver--;
+                }
             }
         }
+        nextReceiver = Math.min(nextReceiver, receivers.size());
 
         return didSomething;
     }