| commit | 5f675beb2b8170bc66ce5f991483e2cb5766b17e | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Fri Aug 16 01:56:37 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Aug 16 01:56:37 2024 +0000 |
| tree | cd3bdc59088ecc02f899ca384ea4a5e8d6c83d7c | |
| parent | ffa96c356e6b1d79be4fd87bfece3d620e9f22f9 [diff] | |
| parent | 91dcf18eb030353d6c82a86683ae77eff5bb3e13 [diff] |
Merge "Fix null dereference in WMShell transition" into main am: 91dcf18eb0 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3220823 Change-Id: Ibe4987c990ca9ffe9210fd1f16f043e99ace87a4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java index d2e6a12..c3a70bb 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java
@@ -724,7 +724,11 @@ Log.e(TAG, "Got duplicate transitionReady for " + transitionToken); // The transition is already somewhere else in the pipeline, so just return here. t.apply(); - existing.mFinishT.merge(finishT); + if (existing.mFinishT != null) { + existing.mFinishT.merge(finishT); + } else { + existing.mFinishT = finishT; + } return; } // This usually means the system is in a bad state and may not recover; however,