diff --git a/services/core/java/com/android/server/wm/TaskDisplayArea.java b/services/core/java/com/android/server/wm/TaskDisplayArea.java index 330c09876e1ed..1b17c87e422de 100644 --- a/services/core/java/com/android/server/wm/TaskDisplayArea.java +++ b/services/core/java/com/android/server/wm/TaskDisplayArea.java @@ -1233,7 +1233,7 @@ final class TaskDisplayArea extends DisplayArea { // 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(); }