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

Commit f2370163 authored by Christopher Tate's avatar Christopher Tate
Browse files

Don't ANR if a broadcast recipient is sitting at a breakpoint 

Change-Id: Idcf4f3f0903a59c1787d636cd2994d97c63c3add
Fixes: 74616569
Test: manual
parent 3912a7f5

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

+10 −3
Original line number Diff line number Diff line
@@ -1457,10 +1457,17 @@ public final class BroadcastQueue { 
            return;

        }



        // If the receiver app is being debugged we quietly ignore unresponsiveness, just

        // tidying up and moving on to the next broadcast without crashing or ANRing this

        // app just because it's stopped at a breakpoint.

        final boolean debugging = (r.curApp != null && r.curApp.debugging);



        Slog.w(TAG, "Timeout of broadcast " + r + " - receiver=" + r.receiver

                + ", started " + (now - r.receiverTime) + "ms ago");

        r.receiverTime = now;

        if (!debugging) {

            r.anrCount++;

        }



        ProcessRecord app = null;

        String anrMessage = null;
@@ -1500,7 +1507,7 @@ public final class BroadcastQueue { 
                r.resultExtras, r.resultAbort, false);

        scheduleBroadcastsLocked();



        if (anrMessage != null) {

        if (!debugging && anrMessage != null) {

            // Post the ANR to the handler since we do not want to process ANRs while

            // potentially holding our lock.

            mHandler.post(new AppNotResponding(app, anrMessage));