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

Commit ae1def7b authored by Ben Miles's avatar Ben Miles
Browse files

Add timeout duration to broadcast ANRs 

Before: Subject: Broadcast of Intent { ... }

After: Subject: Broadcast of Intent { ... }, waited 5001ms

Change-Id: Id384d00901217318313d67fb9ee0b2482021bba8
Bug: 238079066
Test: Existing tests pass
parent a58e7526

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

+5 −2
Original line number Diff line number Diff line
@@ -2125,8 +2125,9 @@ public final class BroadcastQueue { 
        // app just because it's stopped at a breakpoint.

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



        long timeoutDurationMs = now - r.receiverTime;

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

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

                + ", started " + timeoutDurationMs + "ms ago");

        r.receiverTime = now;

        if (!debugging) {

            r.anrCount++;
@@ -2158,7 +2159,9 @@ public final class BroadcastQueue { 
        }



        if (app != null) {

            anrMessage = "Broadcast of " + r.intent.toString();

            anrMessage =

                    "Broadcast of " + r.intent.toString() + ", waited " + timeoutDurationMs

                            + "ms";

        }



        if (mPendingBroadcast == r) {