Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

prevent crash with pin protected user and taskview

Browse Source 
add forgotten null check

Bug: 265981088
Test: unit tests, CTS tests, manual tests on target
Change-Id: I16904357b28cbf73f19291010427854a45af6adc
Merged-In: I16904357b28cbf73f19291010427854a45af6adc
This commit is contained in:
Carsten Rohn
2023-01-19 16:33:30 +01:00
committed by Yuncheol Heo
parent c3835e6b4c
commit fa4038fb8b
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/wm/TaskDisplayArea.java
View File

@@ -1222,7 +1222,7 @@ final class TaskDisplayArea extends DisplayArea<WindowContainer> {
// Clear last paused activity if focused root task changed while sleeping, so that the // Clear last paused activity if focused root task changed while sleeping, so that the
// top activity of current focused task can be resumed. // top activity of current focused task can be resumed.
if (mDisplayContent.isSleeping()) { if (mDisplayContent.isSleeping() && currentFocusedTask != null) {
currentFocusedTask.clearLastPausedActivity(); currentFocusedTask.clearLastPausedActivity();
} }