am 911bd0d3: Merge "Set broadcast nextReceiver correctly when package is disabled" into mnc-dev

* commit '911bd0d3a587a9a58e2bc1cf59615b039ea0e5b2': Set broadcast nextReceiver correctly when package is disabled
2015-08-04 01:00:38 +00:00
parent 2e529712e6 911bd0d3a5
commit ce8921c3c0
1 changed files with 4 additions and 0 deletions
--- a/services/core/java/com/android/server/am/BroadcastRecord.java
+++ b/services/core/java/com/android/server/am/BroadcastRecord.java
@@ -240,8 +240,12 @@ final class BroadcastRecord extends Binder {
                }
                didSomething = true;
                receivers.remove(i);
+                if (i < nextReceiver) {
+                    nextReceiver--;
+                }
            }
        }
+        nextReceiver = Math.min(nextReceiver, receivers.size());

        return didSomething;
    }