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

Commit 0eb141c4 authored by Louis Chang's avatar Louis Chang Committed by Automerger Merge Worker
Browse files

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

Merge "Execute pause timeout only when attached to a process" into tm-dev am: bdeddd76 am: a1f39bcc am: b79a50bc

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18134122



Change-Id: I78121192ecd6720fd5bdbe9fcd4657993707f898
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bd6b8c1c b79a50bc

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);

            }

        }