Merge "prevent crash with pin protected user and taskview" into tm-qpr-dev

2023-03-02 04:45:38 +00:00
parent 9a73d2c207 fa4038fb8b
commit be1752805a
1 changed files with 1 additions and 1 deletions
--- 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();
        }