diff options
| -rw-r--r-- | data/etc/services.core.protolog.json | 6 | ||||
| -rw-r--r-- | services/core/java/com/android/server/wm/TaskFragment.java | 12 |
2 files changed, 14 insertions, 4 deletions
diff --git a/data/etc/services.core.protolog.json b/data/etc/services.core.protolog.json index 742d5a2627eb..917a30061aca 100644 --- a/data/etc/services.core.protolog.json +++ b/data/etc/services.core.protolog.json @@ -4453,6 +4453,12 @@ "group": "WM_DEBUG_BACK_PREVIEW", "at": "com\/android\/server\/wm\/BackNavigationController.java" }, + "1946983717": { + "message": "Waiting for screen on due to %s", + "level": "VERBOSE", + "group": "WM_DEBUG_STATES", + "at": "com\/android\/server\/wm\/TaskFragment.java" + }, "1947239194": { "message": "Deferring rotation, still finishing previous rotation", "level": "VERBOSE", diff --git a/services/core/java/com/android/server/wm/TaskFragment.java b/services/core/java/com/android/server/wm/TaskFragment.java index d425bdf5613f..4ad4b0c388ec 100644 --- a/services/core/java/com/android/server/wm/TaskFragment.java +++ b/services/core/java/com/android/server/wm/TaskFragment.java @@ -926,10 +926,14 @@ class TaskFragment extends WindowContainer<WindowContainer> { boolean sleepIfPossible(boolean shuttingDown) { boolean shouldSleep = true; if (mResumedActivity != null) { - // Still have something resumed; can't sleep until it is paused. - ProtoLog.v(WM_DEBUG_STATES, "Sleep needs to pause %s", mResumedActivity); - startPausing(false /* userLeaving */, true /* uiSleeping */, null /* resuming */, - "sleep"); + if (!shuttingDown && mResumedActivity.canTurnScreenOn()) { + ProtoLog.v(WM_DEBUG_STATES, "Waiting for screen on due to %s", mResumedActivity); + } else { + // Still have something resumed; can't sleep until it is paused. + ProtoLog.v(WM_DEBUG_STATES, "Sleep needs to pause %s", mResumedActivity); + startPausing(false /* userLeaving */, true /* uiSleeping */, null /* resuming */, + "sleep"); + } shouldSleep = false; } else if (mPausingActivity != null) { // Still waiting for something to pause; can't sleep yet. |