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

Commit fa4038fb authored by Carsten Rohn's avatar Carsten Rohn Committed by Yuncheol Heo
Browse files

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
parent c3835e6b

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

+1 −1
Original line number Original line 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

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

        }

        }