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

Commit 0f533e91 authored by Robin Lee's avatar Robin Lee
Browse files

Fix re-entrant issue in Keyguard / Mixed handler 

We need to:

- Increment mInFlightSubAnimations optimistically before startAnimation
  because it might immediately call back before even returning true,
  which is allowed. If it doesn't do this and returns false instead, no
  problem; we'll just decrement it again.

- Post finish callback from Keyguard's "Remote" Transitions (which are
  just remote for API compatibility and execute synchronously in the
  same process) so that housekeeping from startAnimation can be
  guaranteed to finish before the onFinish callback comes back around

Bug: 286242775
Bug: 286507622 # to be confirmed
Test: atest WMShellUnitTests:ShellTransitionTests
Test: atest KeyguardTests
Change-Id: Ida3035f1a99992a1309033ffdd7498298e44e81f
parent 522646d7

libs/WindowManager/Shell/src/com/android/wm/shell/keyguard/KeyguardTransitionHandler.java

+5 −4
Original line number Diff line number Diff line
@@ -156,6 +156,8 @@ public class KeyguardTransitionHandler implements Transitions.TransitionHandler 
                "start keyguard %s transition, info = %s", description, info);



        try {

            mStartedTransitions.put(transition,

                    new StartedTransition(info, finishTransaction, remoteHandler));

            remoteHandler.startAnimation(transition, info, startTransaction,

                    new IRemoteTransitionFinishedCallback.Stub() {

                        @Override
@@ -164,14 +166,13 @@ public class KeyguardTransitionHandler implements Transitions.TransitionHandler 
                            if (sct != null) {

                                finishTransaction.merge(sct);

                            }

                            mMainExecutor.execute(() -> {

                            // Post our finish callback to let startAnimation finish first.

                            mMainExecutor.executeDelayed(() -> {

                                mStartedTransitions.remove(transition);

                                finishCallback.onTransitionFinished(wct, null);

                            });

                            }, 0);

                        }

                    });

            mStartedTransitions.put(transition,

                    new StartedTransition(info, finishTransaction, remoteHandler));

        } catch (RemoteException e) {

            Log.wtf(TAG, "RemoteException thrown from local IRemoteTransition", e);

            return false;

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

+2 −1
Original line number Diff line number Diff line
@@ -574,11 +574,12 @@ public class DefaultMixedHandler implements Transitions.TransitionHandler, 
                finishCallback.onTransitionFinished(wct, wctCB);

            }

        };

        mixed.mInFlightSubAnimations++;

        if (!mKeyguardHandler.startAnimation(

                mixed.mTransition, info, startTransaction, finishTransaction, finishCB)) {

            mixed.mInFlightSubAnimations--;

            return false;

        }

        mixed.mInFlightSubAnimations++;

        // Sync pip state.

        if (mPipHandler != null) {

            // We don't know when to apply `startTransaction` so use a separate transaction here.