Merge "Always call finished when merging with an ongoing recents transition" into udc-dev (1c9c183a) · Commits · e / os / android_frameworks_base

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

+9 −8

Original line number	Diff line number	Diff line
		@@ -133,7 +133,7 @@ public class RecentsTransitionHandler implements Transitions.TransitionHandler {
		public WindowContainerTransaction handleRequest(IBinder transition,
		TransitionRequestInfo request) {
		// do not directly handle requests. Only entry point should be via startRecentsTransition
		Slog.e(TAG, "RecentsTransitionHandler.handleRequest: Unexpected transition request");
		// TODO: Only log an error if the transition is a recents transition
		return null;
		}

		@@ -618,7 +618,7 @@ public class RecentsTransitionHandler implements Transitions.TransitionHandler {
		t.apply();
		// not using the incoming anim-only surfaces
		info.releaseAnimSurfaces();
		if (appearedTargets == null) return;
		if (appearedTargets != null) {
		try {
		ProtoLog.v(ShellProtoLogGroup.WM_SHELL_RECENTS_TRANSITION,
		"[%d] RecentsController.merge: calling onTasksAppeared", mInstanceId);
		@@ -626,6 +626,7 @@ public class RecentsTransitionHandler implements Transitions.TransitionHandler {
		} catch (RemoteException e) {
		Slog.e(TAG, "Error sending appeared tasks to recents animation", e);
		}
		}
		finishCallback.onTransitionFinished(null /* wct /, null / wctCB */);
		}