Merge "Remove unused paramater to finish" into main (0d3fabcf) · Commits · e / os / android_frameworks_base

core/java/android/window/IWindowOrganizerController.aidl

+1 −6

Original line number	Diff line number	Diff line
		@@ -80,13 +80,8 @@ interface IWindowOrganizerController {
		* Finishes a transition. This must be called for all created transitions.
		* @param transitionToken Which transition to finish
		* @param t Changes to make before finishing but in the same SF Transaction. Can be null.
		* @param callback Called when t is finished applying.
		* @return An ID for the sync operation (see {@link #applySyncTransaction}. This will be
		* negative if no sync transaction was attached (null t or callback)
		*/
		int finishTransition(in IBinder transitionToken,
		in @nullable WindowContainerTransaction t,
		in IWindowContainerTransactionCallback callback);
		void finishTransition(in IBinder transitionToken, in @nullable WindowContainerTransaction t);

		/** @return An interface enabling the management of task organizers. */
		ITaskOrganizerController getTaskOrganizerController();

+3 −7

Original line number	Diff line number	Diff line
		@@ -115,19 +115,15 @@ public class WindowOrganizer {
		* Finishes a running transition.
		* @param transitionToken The transition to finish. Can't be null.
		* @param t A set of window operations to apply before finishing.
		* @param callback A sync callback (if provided). See {@link #applySyncTransaction}.
		* @return An ID for the sync operation if performed. See {@link #applySyncTransaction}.
		*
		* @hide
		*/
		@SuppressLint("ExecutorRegistration")
		@RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_TASKS)
		public int finishTransition(@NonNull IBinder transitionToken,
		@Nullable WindowContainerTransaction t,
		@Nullable WindowContainerTransactionCallback callback) {
		public void finishTransition(@NonNull IBinder transitionToken,
		@Nullable WindowContainerTransaction t) {
		try {
		return getWindowOrganizerController().finishTransition(transitionToken, t,
		callback != null ? callback.mInterface : null);
		getWindowOrganizerController().finishTransition(transitionToken, t);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -186,6 +186,6 @@ public class ActivityEmbeddingController implements Transitions.TransitionHandle
		if (callback == null) {
		throw new IllegalStateException("No finish callback found");
		}
		callback.onTransitionFinished(null /* wct /, null / wctCB */);
		callback.onTransitionFinished(null /* wct */);
		}
		}

+4 −5

Original line number	Diff line number	Diff line
		@@ -241,7 +241,7 @@ public class EnterDesktopTaskTransitionHandler implements Transitions.Transition
		public void onAnimationEnd(Animator animation) {
		mDesktopModeWindowDecoration.hideResizeVeil();
		mTransitions.getMainExecutor().execute(
		() -> finishCallback.onTransitionFinished(null, null));
		() -> finishCallback.onTransitionFinished(null));
		}
		});
		animator.start();
		@@ -271,8 +271,7 @@ public class EnterDesktopTaskTransitionHandler implements Transitions.Transition

		startT.apply();

		mTransitions.getMainExecutor().execute(
		() -> finishCallback.onTransitionFinished(null, null));
		mTransitions.getMainExecutor().execute(() -> finishCallback.onTransitionFinished(null));

		return true;
		}
		@@ -324,7 +323,7 @@ public class EnterDesktopTaskTransitionHandler implements Transitions.Transition
		mOnAnimationFinishedCallback.accept(finishT);
		}
		mTransitions.getMainExecutor().execute(
		() -> finishCallback.onTransitionFinished(null, null));
		() -> finishCallback.onTransitionFinished(null));
		}
		});

		@@ -378,7 +377,7 @@ public class EnterDesktopTaskTransitionHandler implements Transitions.Transition
		mOnAnimationFinishedCallback.accept(finishT);
		}
		mTransitions.getMainExecutor().execute(
		() -> finishCallback.onTransitionFinished(null, null));
		() -> finishCallback.onTransitionFinished(null));
		}
		});
		animator.start();

+1 −1

Original line number	Diff line number	Diff line
		@@ -168,7 +168,7 @@ public class ExitDesktopTaskTransitionHandler implements Transitions.TransitionH
		mOnAnimationFinishedCallback.accept(finishT);
		}
		mTransitions.getMainExecutor().execute(
		() -> finishCallback.onTransitionFinished(null, null));
		() -> finishCallback.onTransitionFinished(null));
		}
		});
		animator.start();