diff options
| -rw-r--r-- | libs/WindowManager/Shell/src/com/android/wm/shell/fullscreen/FullscreenTaskListener.java | 2 | 
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);          } |