Merge "Don't apply transactions of abort out-of-order." into udc-dev (bb726e9c) · Commits · e / os / android_frameworks_base

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

+3 −4

Original line number	Diff line number	Diff line
		@@ -809,6 +809,9 @@ public class Transitions implements RemoteCallable<Transitions>,
		track.mReadyTransitions.remove(0);
		track.mActiveTransition = ready;
		if (ready.mAborted) {
		if (ready.mStartT != null) {
		ready.mStartT.apply();
		}
		// finish now since there's nothing to animate. Calls back into processReadyQueue
		onFinish(ready, null, null);
		return;
		@@ -936,10 +939,6 @@ public class Transitions implements RemoteCallable<Transitions>,
		/** Aborts a transition. This will still queue it up to maintain order. */
		private void onAbort(ActiveTransition transition) {
		final Track track = mTracks.get(transition.getTrack());
		// apply immediately since they may be "parallel" operations: We currently we use abort for
		// thing which are independent to other transitions (like starting-window transfer).
		transition.mStartT.apply();
		transition.mFinishT.apply();
		transition.mAborted = true;

		mTracer.logAborted(transition.mInfo.getDebugId());