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

Commit a1c0bdbd authored by Nimrod Gileadi's avatar Nimrod Gileadi Committed by android-build-merger
Browse files

resolve merge conflicts of 448489a9 to cw-f-dev am: f2122f5f 

am: da2908cf

Change-Id: Ia169a8a4db36229638997d5a09b86fe964d0c533
parents 296a4c31 da2908cf

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

+2 −1
Original line number Diff line number Diff line
@@ -228,7 +228,8 @@ public final class BroadcastQueue { 
    public final boolean replaceParallelBroadcastLocked(BroadcastRecord r) {

        final Intent intent = r.intent;

        for (int i = mParallelBroadcasts.size() - 1; i >= 0; i--) {

            if (intent.filterEquals(mParallelBroadcasts.get(i).intent)) {

            final Intent curIntent = mParallelBroadcasts.get(i).intent;

            if (intent.filterEquals(curIntent)) {

                if (DEBUG_BROADCAST) Slog.v(TAG_BROADCAST,

                        "***** DROPPING PARALLEL ["

                + mQueueName + "]: " + intent);

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

+3 −0
Original line number Diff line number Diff line
@@ -219,6 +219,9 @@ final class BroadcastRecord extends Binder { 
            int _resultCode, String _resultData, Bundle _resultExtras, boolean _serialized,

            boolean _sticky, boolean _initialSticky,

            int _userId) {

        if (_intent == null) {

            throw new NullPointerException("Can't construct with a null intent");

        }

        queue = _queue;

        intent = _intent;

        targetComp = _intent.getComponent();