Merge "Fixing UI Crash" into tm-qpr-dev am: b25a29ed88

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19972432

Change-Id: I4463bdb62bb0721f422f858dc5765239a78e6016
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Maryam Dehaini
2022-09-16 20:34:31 +00:00
committed by Automerger Merge Worker

View File

@@ -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);
}