diff options
| -rw-r--r-- | services/core/java/com/android/server/wm/TaskDisplayArea.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/TaskDisplayArea.java b/services/core/java/com/android/server/wm/TaskDisplayArea.java index 79be9463aa05..2086b522aa66 100644 --- a/services/core/java/com/android/server/wm/TaskDisplayArea.java +++ b/services/core/java/com/android/server/wm/TaskDisplayArea.java @@ -1222,7 +1222,7 @@ final class TaskDisplayArea extends DisplayArea<WindowContainer> { // Clear last paused activity if focused root task changed while sleeping, so that the // top activity of current focused task can be resumed. - if (mDisplayContent.isSleeping()) { + if (mDisplayContent.isSleeping() && currentFocusedTask != null) { currentFocusedTask.clearLastPausedActivity(); } |