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

Commit 4ffe9032 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix SFPS unlock not working while on Glanceable hub" into main

parents b3721dcc a2b3590b

packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/domain/interactor/LogContextInteractorImplTest.kt

+3 −0
Original line number Diff line number Diff line
@@ -164,6 +164,9 @@ class LogContextInteractorImplTest : SysuiTestCase() { 
            keyguardTransitionRepository.startTransitionTo(KeyguardState.PRIMARY_BOUNCER)

            assertThat(displayState()).isEqualTo(AuthenticateOptions.DISPLAY_STATE_LOCKSCREEN)



            keyguardTransitionRepository.startTransitionTo(KeyguardState.GLANCEABLE_HUB)

            assertThat(displayState()).isEqualTo(AuthenticateOptions.DISPLAY_STATE_LOCKSCREEN)



            keyguardTransitionRepository.startTransitionTo(KeyguardState.LOCKSCREEN)

            assertThat(displayState()).isEqualTo(AuthenticateOptions.DISPLAY_STATE_LOCKSCREEN)

packages/SystemUI/src/com/android/systemui/biometrics/domain/interactor/LogContextInteractor.kt

+1 −0
Original line number Diff line number Diff line
@@ -176,6 +176,7 @@ constructor( 
            KeyguardState.LOCKSCREEN,

            KeyguardState.OCCLUDED,

            KeyguardState.ALTERNATE_BOUNCER,

            KeyguardState.GLANCEABLE_HUB,

            KeyguardState.PRIMARY_BOUNCER -> AuthenticateOptions.DISPLAY_STATE_LOCKSCREEN

            KeyguardState.AOD -> AuthenticateOptions.DISPLAY_STATE_AOD

            KeyguardState.OFF,