Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit be278893 authored by Paul Hobbs's avatar Paul Hobbs
Browse files

Revert "Check both isDozing and isAodAvailable for aodVisibility." 

Revert submission 27770576

Reason for revert: breaks tests listed in b/346405951

Reverted changes: /q/submissionid:27770576

Change-Id: Ie87088ce0e4d58b7bd89c19cb7691a9e7f9c2c54
parent 164d6f29

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

+2 −5
Original line number Diff line number Diff line
@@ -229,14 +229,11 @@ constructor( 
    val aodVisibility: Flow<Boolean> =

        combine(

                keyguardInteractor.isDozing,

                keyguardInteractor.isAodAvailable,

                keyguardInteractor.biometricUnlockState,

            ) { isDozing, isAodAvailable, biometricUnlockState ->

            ) { isDozing, biometricUnlockState ->

                // AOD is visible if we're dozing, unless we are wake and unlocking (where we go

                // directly from AOD to unlocked while dozing).

                isDozing &&

                    isAodAvailable &&

                    !BiometricUnlockMode.isWakeAndUnlock(biometricUnlockState.mode)

                isDozing && !BiometricUnlockMode.isWakeAndUnlock(biometricUnlockState.mode)

            }

            .distinctUntilChanged()