summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Maryam Dehaini <mdehaini@google.com> 2022-09-16 19:58:36 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2022-09-16 19:58:36 +0000
commitb25a29ed883e39142f5cc9cd45bb26fe35b8feae (patch)
tree13ccbc39c0c207dd5bafa7516c5cbeb431938d9a
parent31d378dfbe270c7c070f4eac9da253347ff9e84c (diff)
parent1e45037d9030a01670c7b2171440233aaaab02ac (diff)
Merge "Fixing UI Crash" into tm-qpr-dev
-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);
}