Merge "Support playNow on queued SLEEP transits" into main (a10767e3) · Commits · e / os / android_frameworks_base

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

+14 −6

Original line number	Diff line number	Diff line
		@@ -1067,6 +1067,13 @@ class TransitionController {
		// legacy sync
		mSyncEngine.startSyncSet(queued.mLegacySync);
		}
		if (queued.mTransition != null
		&& queued.mTransition.mType == WindowManager.TRANSIT_SLEEP) {
		// SLEEP transitions are special in that they don't collect anything (in fact if they
		// do collect things it can cause problems). So, we need to run it's onCollectStarted
		// immediately.
		queued.mOnStartCollect.onCollectStarted(true /* deferred */);
		} else {
		// Post this so that the now-playing transition logic isn't interrupted.
		mAtm.mH.post(() -> {
		synchronized (mAtm.mGlobalLock) {
		@@ -1074,6 +1081,7 @@ class TransitionController {
		}
		});
		}
		}

		void moveToPlaying(Transition transition) {
		if (transition == mCollectingTransition) {