From 24b243d53d47ba132588aadf5336f2394c6193fe Mon Sep 17 00:00:00 2001 From: Wale Ogunwale Date: Fri, 17 Jul 2015 07:20:57 -0700 Subject: Fixed bad merge conflict resolution https://android-review.googlesource.com/#/c/137534/ was accepted and merged on 03/04/15. However, a bad merge conflict resolution caused half of the change to be reverted. This adds back the missing change. Change-Id: I4f7c2503e60321b692e12316961958b149baf4ea --- .../core/java/com/android/server/am/BroadcastQueue.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/services/core/java/com/android/server/am/BroadcastQueue.java b/services/core/java/com/android/server/am/BroadcastQueue.java index 91d97ef14646..a956c564f9ee 100644 --- a/services/core/java/com/android/server/am/BroadcastQueue.java +++ b/services/core/java/com/android/server/am/BroadcastQueue.java @@ -321,14 +321,12 @@ public final class BroadcastQueue { } public void skipCurrentReceiverLocked(ProcessRecord app) { - BroadcastRecord r = app.curReceiver; - if (r != null && r.queue == this) { - // The current broadcast is waiting for this app's receiver - // to be finished. Looks like that's not going to happen, so - // let the broadcast continue. - logBroadcastReceiverDiscardLocked(r); - finishReceiverLocked(r, r.resultCode, r.resultData, - r.resultExtras, r.resultAbort, false); + BroadcastRecord r = null; + if (mOrderedBroadcasts.size() > 0) { + BroadcastRecord br = mOrderedBroadcasts.get(0); + if (br.curApp == app) { + r = br; + } } if (r == null && mPendingBroadcast != null && mPendingBroadcast.curApp == app) { if (DEBUG_BROADCAST) Slog.v(TAG_BROADCAST, -- cgit v1.2.3-59-g8ed1b