commit | b25a29ed883e39142f5cc9cd45bb26fe35b8feae | [log] [tgz] |
---|---|---|
author | Maryam Dehaini <mdehaini@google.com> | Fri Sep 16 19:58:36 2022 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Sep 16 19:58:36 2022 +0000 |
tree | 13ccbc39c0c207dd5bafa7516c5cbeb431938d9a | |
parent | 31d378dfbe270c7c070f4eac9da253347ff9e84c [diff] | |
parent | 1e45037d9030a01670c7b2171440233aaaab02ac [diff] |
Merge "Fixing UI Crash" into tm-qpr-dev
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); }