Merge "Remove bad AOD->OCCLUDED transition" into main (11ed261f) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromAodTransitionInteractor.kt

+2 −5

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		package com.android.systemui.keyguard.domain.interactor

		import android.animation.ValueAnimator
		import android.util.Log
		import com.android.app.animation.Interpolators
		import com.android.app.tracing.coroutines.launch
		import com.android.systemui.dagger.SysUISingleton
		@@ -184,11 +185,7 @@ constructor(
		.filterRelevantKeyguardStateAnd { isOccluded -> isOccluded }
		.collect {
		if (!maybeHandleInsecurePowerGesture()) {
		startTransitionTo(
		toState = KeyguardState.OCCLUDED,
		modeOnCanceled = TransitionModeOnCanceled.RESET,
		ownerReason = "isOccluded = true",
		)
		Log.i(TAG, "Ignoring change to isOccluded to prevent errant AOD->OCCLUDED")
		}
		}
		}

+0 −24

Original line number	Diff line number	Diff line
		@@ -1573,30 +1573,6 @@ class KeyguardTransitionScenariosTest(flags: FlagsParameterization?) : SysuiTest
		coroutineContext.cancelChildren()
		}

		@Test
		@BrokenWithSceneContainer(339465026)
		fun aodToOccluded() =
		testScope.runTest {
		// GIVEN a prior transition has run to AOD
		runTransitionAndSetWakefulness(KeyguardState.LOCKSCREEN, KeyguardState.AOD)
		runCurrent()

		// WHEN the keyguard is occluded
		keyguardRepository.setKeyguardOccluded(true)
		runCurrent()

		// THEN a transition to OCCLUDED should occur
		assertThat(transitionRepository)
		.startedTransition(
		ownerName = "FromAodTransitionInteractor(isOccluded = true)",
		from = KeyguardState.AOD,
		to = KeyguardState.OCCLUDED,
		animatorAssertion = { it.isNotNull() },
		)

		coroutineContext.cancelChildren()
		}

		@Test
		@DisableSceneContainer
		fun aodToPrimaryBouncer() =