diff options
| author | Wale Ogunwale <ogunwale@google.com> | 2015-08-04 01:00:38 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-04 01:00:38 +0000 |
| commit | ce8921c3c02b88fcf940e085ac34f3933f5522ac (patch) | |
| tree | 1922ac21e8aa1d0ee2c73824559e0d81a899af65 | |
| parent | 2e529712e67b94aefec81d0e081f9c34c4fef3f7 (diff) | |
| parent | 911bd0d3a587a9a58e2bc1cf59615b039ea0e5b2 (diff) | |
| download | frameworks_base-ce8921c3c02b88fcf940e085ac34f3933f5522ac.zip frameworks_base-ce8921c3c02b88fcf940e085ac34f3933f5522ac.tar.gz frameworks_base-ce8921c3c02b88fcf940e085ac34f3933f5522ac.tar.bz2 | |
am 911bd0d3: Merge "Set broadcast nextReceiver correctly when package is disabled" into mnc-dev
* commit '911bd0d3a587a9a58e2bc1cf59615b039ea0e5b2':
Set broadcast nextReceiver correctly when package is disabled
| -rw-r--r-- | services/core/java/com/android/server/am/BroadcastRecord.java | 4 |
1 files changed, 4 insertions, 0 deletions
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 @@ final class BroadcastRecord extends Binder { } didSomething = true; receivers.remove(i); + if (i < nextReceiver) { + nextReceiver--; + } } } + nextReceiver = Math.min(nextReceiver, receivers.size()); return didSomething; } |