Merge "Skip operation on content overlay if task's vanished" into sc-v2-dev (8dbc9003) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java

+18 −5

Original line number	Diff line number	Diff line
		@@ -1377,11 +1377,20 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener,
		final ValueAnimator animator = ValueAnimator.ofFloat(1.0f, 0.0f);
		animator.setDuration(mCrossFadeAnimationDuration);
		animator.addUpdateListener(animation -> {
		if (mPipTransitionState.getTransitionState() == PipTransitionState.UNDEFINED) {
		// Could happen if onTaskVanished happens during the animation since we may have
		// set a start delay on this animation.
		Log.d(TAG, "Task vanished, skip fadeOutAndRemoveOverlay");
		animation.removeAllListeners();
		animation.removeAllUpdateListeners();
		animation.cancel();
		} else {
		final float alpha = (float) animation.getAnimatedValue();
		final SurfaceControl.Transaction transaction =
		mSurfaceControlTransactionFactory.getTransaction();
		transaction.setAlpha(surface, alpha);
		transaction.apply();
		}
		});
		animator.addListener(new AnimatorListenerAdapter() {
		@Override
		@@ -1394,6 +1403,10 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener,
		}

		private void removeContentOverlay(SurfaceControl surface, Runnable callback) {
		if (mPipTransitionState.getTransitionState() == PipTransitionState.UNDEFINED) {
		// Avoid double removal, which is fatal.
		return;
		}
		final SurfaceControl.Transaction tx =
		mSurfaceControlTransactionFactory.getTransaction();
		tx.remove(surface);