From fa4038fb8b8d6008f2d48c81b346cbd3b14a25aa Mon Sep 17 00:00:00 2001
From: Carsten Rohn <carsten.rohn@bmw.de>
Date: Thu, 19 Jan 2023 16:33:30 +0100
Subject: [PATCH] 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
---
 services/core/java/com/android/server/wm/TaskDisplayArea.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/wm/TaskDisplayArea.java b/services/core/java/com/android/server/wm/TaskDisplayArea.java
index 79be9463aa05b..2086b522aa668 100644
--- a/services/core/java/com/android/server/wm/TaskDisplayArea.java
+++ b/services/core/java/com/android/server/wm/TaskDisplayArea.java
@@ -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();
         }