Merge "Fix issues with early-finish" into tm-qpr-dev (fac74db1) · Commits · e / os / android_frameworks_base

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();
		}
		});

+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) {