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

Commit be175280 authored by Yuncheol Heo's avatar Yuncheol Heo Committed by Android (Google) Code Review
Browse files

Merge "prevent crash with pin protected user and taskview" into tm-qpr-dev

parents 9a73d2c2 fa4038fb

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();

        }