From 1e45037d9030a01670c7b2171440233aaaab02ac Mon Sep 17 00:00:00 2001
From: Maryam <mdehaini@google.com>
Date: Thu, 15 Sep 2022 15:17:44 -0700
Subject: [PATCH] Fixing UI Crash

UI crashing due to null windowDecor object being passed into
FullscreenTaskListener#giveWindowDecoration
Test: Manual Testing
Bug: 246637353

Change-Id: Iaefee1993e1477cb88ed34d8e94b5f24120152f1
---
 .../com/android/wm/shell/fullscreen/FullscreenTaskListener.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/fullscreen/FullscreenTaskListener.java b/libs/WindowManager/Shell/src/com/android/wm/shell/fullscreen/FullscreenTaskListener.java
index e9f9bb5d73273..6ccf976e460c7 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/fullscreen/FullscreenTaskListener.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/fullscreen/FullscreenTaskListener.java
@@ -256,7 +256,7 @@ public class FullscreenTaskListener<T extends AutoCloseable>
             windowDecor =
                     mWindowDecorOfVanishedTasks.removeReturnOld(taskInfo.taskId);
         }
-        if (mWindowDecorViewModelOptional.isPresent()) {
+        if (mWindowDecorViewModelOptional.isPresent() && windowDecor != null) {
             mWindowDecorViewModelOptional.get().setupWindowDecorationForTransition(
                     taskInfo, startT, finishT, windowDecor);
         }