Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f675beb authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix null dereference in WMShell transition" into main am: 91dcf18e 

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



Change-Id: Ibe4987c990ca9ffe9210fd1f16f043e99ace87a4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ffa96c35 91dcf18e

libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java

+5 −1
Original line number Diff line number Diff line
@@ -724,7 +724,11 @@ public class Transitions implements RemoteCallable<Transitions>, 
                Log.e(TAG, "Got duplicate transitionReady for " + transitionToken);

                // The transition is already somewhere else in the pipeline, so just return here.

                t.apply();

                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,