Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d38aad79 authored by Yuncheol Heo's avatar Yuncheol Heo Committed by Automerger Merge Worker
Browse files

Merge "prevent crash with pin protected user and taskview" am: b98b2c84 

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



Change-Id: Ia34c039c671c727e5d5b179faef5ee58857ce87c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a513296a b98b2c84

services/core/java/com/android/server/wm/TaskDisplayArea.java

+1 −1
Original line number Diff line number Diff line
@@ -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();

        }