diff options
2 files changed, 2 insertions, 29 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromAodTransitionInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromAodTransitionInteractor.kt index 893835a38c53..59ec87a74980 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromAodTransitionInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromAodTransitionInteractor.kt @@ -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") } } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardTransitionScenariosTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardTransitionScenariosTest.kt index fc3b35d637f7..a3959d2109c8 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardTransitionScenariosTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardTransitionScenariosTest.kt @@ -1574,30 +1574,6 @@ class KeyguardTransitionScenariosTest(flags: FlagsParameterization?) : SysuiTest } @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() = testScope.runTest { |