summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Maryam <mdehaini@google.com> 2022-09-15 15:17:44 -0700
committer Maryam <mdehaini@google.com> 2022-09-15 16:19:48 -0700
commit1e45037d9030a01670c7b2171440233aaaab02ac (patch)
treeec8aa3476ba541dec96bc70d7a68123eddcbb9be
parentdb23075abbca9abbded4586f479ad88c5f35f865 (diff)
Fixing UI Crash
UI crashing due to null windowDecor object being passed into FullscreenTaskListener#giveWindowDecoration Test: Manual Testing Bug: 246637353 Change-Id: Iaefee1993e1477cb88ed34d8e94b5f24120152f1
-rw-r--r--libs/WindowManager/Shell/src/com/android/wm/shell/fullscreen/FullscreenTaskListener.java2
1 files changed, 1 insertions, 1 deletions
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 e9f9bb5d7327..6ccf976e460c 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);
}