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

Commit 8c41dfdb 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 am: 5f675beb 

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



Change-Id: I0e2ab814f0c134eea2e1583b5333ede44795ed46
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5242642e 5f675beb

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

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

                Log.e(TAG, "Got duplicate transitionReady for " + transitionToken);

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

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

                t.apply();

                t.apply();

                if (existing.mFinishT != null) {

                    existing.mFinishT.merge(finishT);

                    existing.mFinishT.merge(finishT);

                } else {

                    existing.mFinishT = finishT;

                }

                return;

                return;

            }

            }

            // This usually means the system is in a bad state and may not recover; however,

            // This usually means the system is in a bad state and may not recover; however,