diff options
| author | 2023-01-19 16:33:30 +0100 | |
|---|---|---|
| committer | 2023-02-24 10:46:10 -0800 | |
| commit | fa4038fb8b8d6008f2d48c81b346cbd3b14a25aa (patch) | |
| tree | ed511d03a8a5328694f59e34c29cf4c746d2c510 | |
| parent | c3835e6b4cd9b7c99bacbd17ee4d575cea0cb64e (diff) | |
prevent crash with pin protected user and taskview
add forgotten null check
Bug: 265981088
Test: unit tests, CTS tests, manual tests on target
Change-Id: I16904357b28cbf73f19291010427854a45af6adc
Merged-In: I16904357b28cbf73f19291010427854a45af6adc
| -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(); } |