Merge "Remove played transitions from KGTransitionHandler" into udc-dev (181a1caa) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/keyguard/KeyguardTransitionHandler.java

+18 −18

Original line number	Diff line number	Diff line
		@@ -186,6 +186,7 @@ public class KeyguardTransitionHandler implements Transitions.TransitionHandler
		public void onTransitionFinished(
		WindowContainerTransaction wct, SurfaceControl.Transaction sct) {
		mMainExecutor.execute(() -> {
		mStartedTransitions.remove(transition);
		finishCallback.onTransitionFinished(wct, null);
		});
		}
		@@ -217,14 +218,17 @@ public class KeyguardTransitionHandler implements Transitions.TransitionHandler
		// the device sleeping/waking, so it's best to ignore this and keep playing anyway.
		return;
		} else {
		finishAnimationImmediately(currentTransition);
		finishAnimationImmediately(currentTransition, playing);
		}
		}

		@Override
		public void onTransitionConsumed(IBinder transition, boolean aborted,
		SurfaceControl.Transaction finishTransaction) {
		finishAnimationImmediately(transition);
		final IRemoteTransition playing = mStartedTransitions.remove(transition);
		if (playing != null) {
		finishAnimationImmediately(transition, playing);
		}
		}

		@Nullable
		@@ -234,10 +238,7 @@ public class KeyguardTransitionHandler implements Transitions.TransitionHandler
		return null;
		}

		private void finishAnimationImmediately(IBinder transition) {
		final IRemoteTransition playing = mStartedTransitions.get(transition);

		if (playing != null) {
		private void finishAnimationImmediately(IBinder transition, IRemoteTransition playing) {
		final IBinder fakeTransition = new Binder();
		final TransitionInfo fakeInfo = new TransitionInfo(TRANSIT_SLEEP, 0x0);
		final SurfaceControl.Transaction fakeT = new SurfaceControl.Transaction();
		@@ -250,7 +251,6 @@ public class KeyguardTransitionHandler implements Transitions.TransitionHandler
		Log.wtf(TAG, "RemoteException thrown from KeyguardService transition", e);
		}
		}
		}

		private static class FakeFinishCallback extends IRemoteTransitionFinishedCallback.Stub {
		@Override