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

Commit 3fb2b713 authored by Craig Mautner's avatar Craig Mautner Committed by Gerrit Code Review
Browse files

Merge "[ActivityManager] Reduce report ANR on wrong activity."

parents dc97144b 309ca5d9

services/java/com/android/server/am/ActivityRecord.java

100644 → 100755
+1 −1
Original line number Diff line number Diff line
@@ -942,8 +942,8 @@ final class ActivityRecord { 
        // for another app to start, then we have paused dispatching

        // for this activity.

        ActivityRecord r = this;

        final ActivityStack stack = task.stack;

        if (r.waitingVisible) {

            final ActivityStack stack = mStackSupervisor.getFocusedStack();

            // Hmmm, who might we be waiting for?

            r = stack.mResumedActivity;

            if (r == null) {