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

Commit bdeddd76 authored by Louis Chang's avatar Louis Chang Committed by Android (Google) Code Review
Browse files

Merge "Execute pause timeout only when attached to a process" into tm-dev

parents 8169e839 6f53188e

services/core/java/com/android/server/wm/ActivityRecord.java

+3 −2
Original line number Diff line number Diff line
@@ -933,9 +933,10 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
            // so we need to be conservative and assume it isn't.

            Slog.w(TAG, "Activity pause timeout for " + ActivityRecord.this);

            synchronized (mAtmService.mGlobalLock) {

                if (hasProcess()) {

                    mAtmService.logAppTooSlow(app, pauseTime, "pausing " + ActivityRecord.this);

                if (!hasProcess()) {

                    return;

                }

                mAtmService.logAppTooSlow(app, pauseTime, "pausing " + ActivityRecord.this);

                activityPaused(true);

            }

        }