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

Commit e84a2eee authored by Robin Lee's avatar Robin Lee Committed by Automerger Merge Worker
Browse files

Merge "Fix non tailcall onTransitionFinished" into udc-dev am: 7000dc95 

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



Change-Id: Ifeeee7cd24a7143c7d6ee8b50b241c68cfd0a671
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 30b2494f 7000dc95

libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentsTransitionHandler.java

+3 −8
Original line number Diff line number Diff line
@@ -213,12 +213,7 @@ public class RecentsTransitionHandler implements Transitions.TransitionHandler { 


        RecentsController(IRecentsAnimationRunner listener) {

            mListener = listener;

            mDeathHandler = () -> mExecutor.execute(() -> {

                if (mListener == null) return;

                if (mFinishCB != null) {

                    finish(mWillFinishToHome, false /* leaveHint */);

                }

            });

            mDeathHandler = () -> finish(mWillFinishToHome, false /* leaveHint */);

            try {

                mListener.asBinder().linkToDeath(mDeathHandler, 0 /* flags */);

            } catch (RemoteException e) {
@@ -245,7 +240,7 @@ public class RecentsTransitionHandler implements Transitions.TransitionHandler { 
                }

            }

            if (mFinishCB != null) {

                finish(toHome, false /* userLeave */);

                finishInner(toHome, false /* userLeave */);

            } else {

                cleanUp();

            }
@@ -552,13 +547,13 @@ public class RecentsTransitionHandler implements Transitions.TransitionHandler { 
            t.apply();

            // not using the incoming anim-only surfaces

            info.releaseAnimSurfaces();

            finishCallback.onTransitionFinished(null /* wct */, null /* wctCB */);

            if (appearedTargets == null) return;

            try {

                mListener.onTasksAppeared(appearedTargets);

            } catch (RemoteException e) {

                Slog.e(TAG, "Error sending appeared tasks to recents animation", e);

            }

            finishCallback.onTransitionFinished(null /* wct */, null /* wctCB */);

        }



        /** For now, just set-up a jump-cut to the new activity. */