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

Commit 29173f1d authored by Evan Rosky's avatar Evan Rosky Committed by Automerger Merge Worker
Browse files

Merge "Fix issues with early-finish" into tm-qpr-dev am: fac74db1 am: cd68df48 

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



Change-Id: I42bf7c50eaa2d29062722215de792a975c7addea
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 26878a91 cd68df48

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

+6 −0
Original line number Diff line number Diff line
@@ -866,13 +866,19 @@ public class DefaultTransitionHandler implements Transitions.TransitionHandler { 
            });

        };

        va.addListener(new AnimatorListenerAdapter() {

            private boolean mFinished = false;



            @Override

            public void onAnimationEnd(Animator animation) {

                if (mFinished) return;

                mFinished = true;

                finisher.run();

            }



            @Override

            public void onAnimationCancel(Animator animation) {

                if (mFinished) return;

                mFinished = true;

                finisher.run();

            }

        });

packages/SystemUI/shared/src/com/android/systemui/shared/system/RemoteAnimationAdapterCompat.java

+3 −3
Original line number Diff line number Diff line
@@ -220,9 +220,9 @@ public class RemoteAnimationAdapterCompat { 
                        for (int i = info.getChanges().size() - 1; i >= 0; --i) {

                            info.getChanges().get(i).getLeash().release();

                        }

                        for (int i = leashMap.size() - 1; i >= 0; --i) {

                            leashMap.valueAt(i).release();

                        }

                        // Don't release here since launcher might still be using them. Instead

                        // let launcher release them (eg. via RemoteAnimationTargets)

                        leashMap.clear();

                        try {

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

                        } catch (RemoteException e) {