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

Commit 46bdc40a authored by Igor Chernyshev's avatar Igor Chernyshev
Browse files

Fix null dereference in WMShell transition 

Bug: 360220022
Bug: 359968648

Flag: EXEMPT fix obvious code issue
Test: N/A, rare crash

Change-Id: Ica1fc386a8f3a122f19da8a0c4af3b98adbb6d1d
parent ea598ed3

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

+5 −1
Original line number Diff line number Diff line
@@ -667,7 +667,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,