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

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

Merge "Fix re-entrant issue in Keyguard / Mixed handler" into udc-dev am: b4b4f204 

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



Change-Id: I1b9cd5d60f71793442cad898790289b2f8887de9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 07570486 b4b4f204

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

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

                "start keyguard %s transition, info = %s", description, info);





        try {

        try {

            mStartedTransitions.put(transition,

                    new StartedTransition(info, finishTransaction, remoteHandler));

            remoteHandler.startAnimation(transition, info, startTransaction,

            remoteHandler.startAnimation(transition, info, startTransaction,

                    new IRemoteTransitionFinishedCallback.Stub() {

                    new IRemoteTransitionFinishedCallback.Stub() {

                        @Override

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

                            if (sct != null) {

                                finishTransaction.merge(sct);

                                finishTransaction.merge(sct);

                            }

                            }

                            mMainExecutor.execute(() -> {

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

                            mMainExecutor.executeDelayed(() -> {

                                mStartedTransitions.remove(transition);

                                mStartedTransitions.remove(transition);

                                finishCallback.onTransitionFinished(wct, null);

                                finishCallback.onTransitionFinished(wct, null);

                            });

                            }, 0);

                        }

                        }

                    });

                    });

            mStartedTransitions.put(transition,

                    new StartedTransition(info, finishTransaction, remoteHandler));

        } catch (RemoteException e) {

        } catch (RemoteException e) {

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

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

            return false;

            return false;

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

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

                finishCallback.onTransitionFinished(wct, wctCB);

            }

            }

        };

        };

        mixed.mInFlightSubAnimations++;

        if (!mKeyguardHandler.startAnimation(

        if (!mKeyguardHandler.startAnimation(

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

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

            mixed.mInFlightSubAnimations--;

            return false;

            return false;

        }

        }

        mixed.mInFlightSubAnimations++;

        // Sync pip state.

        // Sync pip state.

        if (mPipHandler != null) {

        if (mPipHandler != null) {

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

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