diff options
| author | 2023-02-24 06:33:53 +0000 | |
|---|---|---|
| committer | 2023-02-24 06:33:53 +0000 | |
| commit | 286f21bd7260c386a4414d3d76770045d621fa25 (patch) | |
| tree | cab03383cbeec1aa96d4efe2e38766afc54448f9 | |
| parent | fcb558372a3f3530a5a5d4e977dd9515e7004442 (diff) | |
| parent | d38aad79792bb699877edf242ed9045ad53def3a (diff) | |
Merge "prevent crash with pin protected user and taskview" am: b98b2c84e7 am: d38aad7979
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2392794
Change-Id: I7962884ac3d02213eeec4e82df66bb705e081a7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -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(); } |