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

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

Merge "[flexiglass] Fixes bug where fingerprint text wouldn't show in bouncer" into main

parents 77a5fd4e 0e5f6fac

packages/SystemUI/multivalentTests/src/com/android/systemui/deviceentry/domain/interactor/DeviceUnlockedInteractorTest.kt

+0 −6
Original line number Diff line number Diff line
@@ -367,8 +367,6 @@ class DeviceUnlockedInteractorTest : SysuiTestCase() { 
                    DeviceEntryRestrictionReason.DeviceNotUnlockedSinceReboot,

                LockPatternUtils.StrongAuthTracker.SOME_AUTH_REQUIRED_AFTER_ADAPTIVE_AUTH_REQUEST to

                    DeviceEntryRestrictionReason.AdaptiveAuthRequest,

                LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_LOCKOUT to

                    DeviceEntryRestrictionReason.BouncerLockedOut,

                LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_TIMEOUT to

                    DeviceEntryRestrictionReason.SecurityTimeout,

                LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_USER_LOCKDOWN to
@@ -403,8 +401,6 @@ class DeviceUnlockedInteractorTest : SysuiTestCase() { 
                    DeviceEntryRestrictionReason.DeviceNotUnlockedSinceReboot,

                LockPatternUtils.StrongAuthTracker.SOME_AUTH_REQUIRED_AFTER_ADAPTIVE_AUTH_REQUEST to

                    DeviceEntryRestrictionReason.AdaptiveAuthRequest,

                LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_LOCKOUT to

                    DeviceEntryRestrictionReason.BouncerLockedOut,

                LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_TIMEOUT to

                    DeviceEntryRestrictionReason.SecurityTimeout,

                LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_USER_LOCKDOWN to
@@ -440,8 +436,6 @@ class DeviceUnlockedInteractorTest : SysuiTestCase() { 
                    DeviceEntryRestrictionReason.DeviceNotUnlockedSinceReboot,

                LockPatternUtils.StrongAuthTracker.SOME_AUTH_REQUIRED_AFTER_ADAPTIVE_AUTH_REQUEST to

                    DeviceEntryRestrictionReason.AdaptiveAuthRequest,

                LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_LOCKOUT to

                    DeviceEntryRestrictionReason.BouncerLockedOut,

                LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_TIMEOUT to

                    DeviceEntryRestrictionReason.SecurityTimeout,

                LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_USER_LOCKDOWN to

packages/SystemUI/src/com/android/systemui/deviceentry/domain/interactor/DeviceUnlockedInteractor.kt

+1 −4
Original line number Diff line number Diff line
@@ -132,8 +132,6 @@ constructor( 
                            DeviceEntryRestrictionReason.UnattendedUpdate

                        authFlags.isPrimaryAuthRequiredAfterTimeout ->

                            DeviceEntryRestrictionReason.SecurityTimeout

                        authFlags.isPrimaryAuthRequiredAfterLockout ->

                            DeviceEntryRestrictionReason.BouncerLockedOut

                        isFingerprintLockedOut ->

                            DeviceEntryRestrictionReason.StrongBiometricsLockedOut

                        isFaceLockedOut && faceAuthInteractor.isFaceAuthStrong() ->
@@ -376,8 +374,7 @@ constructor( 
        private val interactor: DeviceUnlockedInteractor,

    ) : CoreStartable {

        override fun start() {

            if (!SceneContainerFlag.isEnabled)

                return

            if (!SceneContainerFlag.isEnabled) return



            applicationScope.launch { interactor.activate() }

        }