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

Merge "prevent crash with pin protected user and taskview" am: b98b2c84e7 am: d38aad7979 am: 286f21bd72

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2392794

Change-Id: I04dc836c7cfbb0e6c681fe22b2a6d8cacab66e9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Yuncheol Heo
2023-02-24 07:31:17 +00:00
committed by Automerger Merge Worker
parent 42139e0eba 286f21bd72
commit 189d4f924b
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

@@ -1225,7 +1225,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();
}