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

Commit fcc8c12c authored by Christopher Tate's avatar Christopher Tate Committed by android-build-merger
Browse files

Merge "Properly clean up broadcast-receiver ANR" into oc-mr1-dev 

am: 9f9ee61c

Change-Id: I07387dbbdf90138d06eaf7c14705946dd4ab2fc5
parents 4120ff71 9f9ee61c

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

+9 −10
Original line number Diff line number Diff line
@@ -1445,20 +1445,19 @@ public final class BroadcastQueue { 
        r.receiverTime = now;

        r.anrCount++;



        // Current receiver has passed its expiration date.

        if (r.nextReceiver <= 0) {

            Slog.w(TAG, "Timeout on receiver with nextReceiver <= 0");

            return;

        }



        ProcessRecord app = null;

        String anrMessage = null;



        Object curReceiver = r.receivers.get(r.nextReceiver-1);

        Object curReceiver;

        if (r.nextReceiver > 0) {

            curReceiver = r.receivers.get(r.nextReceiver-1);

            r.delivery[r.nextReceiver-1] = BroadcastRecord.DELIVERY_TIMEOUT;

        Slog.w(TAG, "Receiver during timeout: " + curReceiver);

        } else {

            curReceiver = r.curReceiver;

        }

        Slog.w(TAG, "Receiver during timeout of " + r + " : " + curReceiver);

        logBroadcastReceiverDiscardLocked(r);

        if (curReceiver instanceof BroadcastFilter) {

        if (curReceiver != null && curReceiver instanceof BroadcastFilter) {

            BroadcastFilter bf = (BroadcastFilter)curReceiver;

            if (bf.receiverList.pid != 0

                    && bf.receiverList.pid != ActivityManagerService.MY_PID) {