Merge "Fix a couple more issues with canceling the recents animation w/ screenshots" into sc-dev (00d2556f) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/wm/RecentsAnimation.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -239,8 +239,10 @@ class RecentsAnimation implements RecentsAnimationCallbacks, OnRootTaskOrderChan
		// Fetch all the surface controls and pass them to the client to get the animation
		// started. Cancel any existing recents animation running synchronously (do not hold the
		// WM lock)
		mWindowManager.cancelRecentsAnimation(REORDER_MOVE_TO_ORIGINAL_POSITION,
		"startRecentsActivity");
		if (mWindowManager.getRecentsAnimationController() != null) {
		mWindowManager.getRecentsAnimationController().forceCancelAnimation(
		REORDER_MOVE_TO_ORIGINAL_POSITION, "startRecentsActivity");
		}
		mWindowManager.initializeRecentsAnimation(mTargetActivityType, recentsAnimationRunner,
		this, mDefaultTaskDisplayArea.getDisplayId(),
		mTaskSupervisor.mRecentTasks.getRecentTaskIds(), targetActivity);

services/core/java/com/android/server/wm/RecentsAnimationController.java

+20 −19

Original line number	Diff line number	Diff line
		@@ -122,9 +122,7 @@ public class RecentsAnimationController implements DeathRecipient {
		new ArrayList<>();
		private final int mDisplayId;
		private boolean mWillFinishToHome = false;
		private final Runnable mFailsafeRunnable = () -> cancelAnimation(
		mWillFinishToHome ? REORDER_MOVE_TO_TOP : REORDER_MOVE_TO_ORIGINAL_POSITION,
		"failSafeRunnable");
		private final Runnable mFailsafeRunnable = this::onFailsafe;

		// The recents component app token that is shown behind the visibile tasks
		private ActivityRecord mTargetActivityRecord;
		@@ -262,9 +260,6 @@ public class RecentsAnimationController implements DeathRecipient {
		final long token = Binder.clearCallingIdentity();
		try {
		synchronized (mService.getWindowManagerLock()) {
		if (mCanceled) {
		return;
		}
		// Remove all new task targets.
		for (int i = mPendingNewTaskTargets.size() - 1; i >= 0; i--) {
		removeTaskInternal(mPendingNewTaskTargets.get(i));
		@@ -807,6 +802,14 @@ public class RecentsAnimationController implements DeathRecipient {
		}, mPendingWallpaperAnimations);
		}

		void forceCancelAnimation(@ReorderMode int reorderMode, String reason) {
		if (!mCanceled) {
		cancelAnimation(reorderMode, reason);
		} else {
		continueDeferredCancelAnimation();
		}
		}

		void cancelAnimation(@ReorderMode int reorderMode, String reason) {
		cancelAnimation(reorderMode, false /screenshot /, reason);
		}
		@@ -821,9 +824,6 @@ public class RecentsAnimationController implements DeathRecipient {
		* finish the animation.
		*/
		public void cancelAnimationForHomeStart() {
		if (mCanceled) {
		return;
		}
		final int reorderMode = mTargetActivityType == ACTIVITY_TYPE_HOME && mWillFinishToHome
		? REORDER_MOVE_TO_TOP
		: REORDER_KEEP_IN_PLACE;
		@@ -836,9 +836,6 @@ public class RecentsAnimationController implements DeathRecipient {
		* how to finish the animation.
		*/
		public void cancelAnimationForDisplayChange() {
		if (mCanceled) {
		return;
		}
		cancelAnimation(mWillFinishToHome ? REORDER_MOVE_TO_TOP : REORDER_MOVE_TO_ORIGINAL_POSITION,
		true /* screenshot */, "cancelAnimationForDisplayChange");
		}
		@@ -868,6 +865,8 @@ public class RecentsAnimationController implements DeathRecipient {
		if (taskSnapshot != null) {
		// Defer until the runner calls back to cleanupScreenshot()
		adapter.setSnapshotOverlay(taskSnapshot);
		// Schedule a new failsafe for if the runner doesn't clean up the screenshot
		scheduleFailsafe();
		} else {
		// Do a normal cancel since we couldn't screenshot
		mCallbacks.onAnimationFinished(reorderMode, false /* sendUserLeaveHint */);
		@@ -1014,6 +1013,12 @@ public class RecentsAnimationController implements DeathRecipient {
		mService.mH.postDelayed(mFailsafeRunnable, FAILSAFE_DELAY);
		}

		void onFailsafe() {
		forceCancelAnimation(
		mWillFinishToHome ? REORDER_MOVE_TO_TOP : REORDER_MOVE_TO_ORIGINAL_POSITION,
		"onFailsafe");
		}

		private void linkToDeathOfRunner() throws RemoteException {
		if (!mLinkedToDeathOfRunner) {
		mRunner.asBinder().linkToDeath(this, 0);
		@@ -1030,13 +1035,7 @@ public class RecentsAnimationController implements DeathRecipient {

		@Override
		public void binderDied() {
		if (!mCanceled) {
		cancelAnimation(REORDER_MOVE_TO_ORIGINAL_POSITION, "binderDied");
		} else {
		// If we are already canceled but with a screenshot, and are waiting for the
		// cleanupScreenshot() callback, then force-finish the animation now
		continueDeferredCancelAnimation();
		}
		forceCancelAnimation(REORDER_MOVE_TO_ORIGINAL_POSITION, "binderDied");

		synchronized (mService.getWindowManagerLock()) {
		// Clear associated input consumers on runner death
		@@ -1358,5 +1357,7 @@ public class RecentsAnimationController implements DeathRecipient {
		+ mCancelOnNextTransitionStart);
		pw.print(innerPrefix); pw.println("mCancelDeferredWithScreenshot="
		+ mCancelDeferredWithScreenshot);
		pw.print(innerPrefix); pw.println("mPendingCancelWithScreenshotReorderMode="
		+ mPendingCancelWithScreenshotReorderMode);
		}
		}