commit 1e45037d9030a01670c7b2171440233aaaab02ac
author Maryam <mdehaini@google.com> Thu Sep 15 15:17:44 2022 -0700
committer Maryam <mdehaini@google.com> Thu Sep 15 16:19:48 2022 -0700
tree ec8aa3476ba541dec96bc70d7a68123eddcbb9be
parent db23075abbca9abbded4586f479ad88c5f35f865

Fixing UI Crash

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

Change-Id: Iaefee1993e1477cb88ed34d8e94b5f24120152f1

libs/WindowManager/Shell/src/com/android/wm/shell/fullscreen/FullscreenTaskListener.java

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 e9f9bb5..6ccf976 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 @@
             windowDecor =
                     mWindowDecorOfVanishedTasks.removeReturnOld(taskInfo.taskId);
         }
-        if (mWindowDecorViewModelOptional.isPresent()) {
+        if (mWindowDecorViewModelOptional.isPresent() && windowDecor != null) {
             mWindowDecorViewModelOptional.get().setupWindowDecorationForTransition(
                     taskInfo, startT, finishT, windowDecor);
         }