Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 24b243d5 authored by Wale Ogunwale's avatar Wale Ogunwale
Browse files

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
parent e6b407b4

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

+6 −8
Original line number Diff line number Diff line
@@ -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,