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

Commit 0db0d7ff authored by Beverly Tai's avatar Beverly Tai Committed by Automerger Merge Worker
Browse files

Merge "Don't show the altBouncer if isDozing=true" into tm-qpr-dev am:... 

Merge "Don't show the altBouncer if isDozing=true" into tm-qpr-dev am: 8a34dfc5 am: 7eb130e4 am: c2a7c333 am: 905aa72d

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22137565



Change-Id: Id7c0324ac1f631f0bc986a18e7919377ff468daf
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e91933f8 905aa72d

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

+4 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import com.android.systemui.flags.Flags 
import com.android.systemui.keyguard.data.repository.BiometricSettingsRepository

import com.android.systemui.keyguard.data.repository.DeviceEntryFingerprintAuthRepository

import com.android.systemui.keyguard.data.repository.KeyguardBouncerRepository

import com.android.systemui.plugins.statusbar.StatusBarStateController

import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager.LegacyAlternateBouncer

import com.android.systemui.statusbar.policy.KeyguardStateController

import com.android.systemui.util.time.SystemClock
@@ -34,6 +35,7 @@ import kotlinx.coroutines.flow.Flow 
class AlternateBouncerInteractor

@Inject

constructor(

    private val statusBarStateController: StatusBarStateController,

    private val keyguardStateController: KeyguardStateController,

    private val bouncerRepository: KeyguardBouncerRepository,

    private val biometricSettingsRepository: BiometricSettingsRepository,
@@ -120,7 +122,8 @@ constructor( 
                biometricSettingsRepository.isStrongBiometricAllowed.value &&

                biometricSettingsRepository.isFingerprintEnabledByDevicePolicy.value &&

                !deviceEntryFingerprintAuthRepository.isLockedOut.value &&

                !keyguardStateController.isUnlocked

                !keyguardStateController.isUnlocked &&

                !statusBarStateController.isDozing

        } else {

            legacyAlternateBouncer != null &&

                keyguardUpdateMonitor.isUnlockingWithBiometricAllowed(true)

packages/SystemUI/tests/src/com/android/systemui/biometrics/SideFpsControllerTest.kt

+3 −2
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ import com.android.systemui.keyguard.data.repository.FakeBiometricSettingsReposi 
import com.android.systemui.keyguard.data.repository.FakeDeviceEntryFingerprintAuthRepository

import com.android.systemui.keyguard.data.repository.FakeKeyguardBouncerRepository

import com.android.systemui.keyguard.domain.interactor.AlternateBouncerInteractor

import com.android.systemui.plugins.statusbar.StatusBarStateController

import com.android.systemui.recents.OverviewProxyService

import com.android.systemui.statusbar.policy.KeyguardStateController

import com.android.systemui.util.concurrency.FakeExecutor
@@ -98,7 +99,6 @@ class SideFpsControllerTest : SysuiTestCase() { 


    @JvmField @Rule var rule = MockitoJUnit.rule()



    @Mock lateinit var keyguardStateController: KeyguardStateController

    @Mock lateinit var layoutInflater: LayoutInflater

    @Mock lateinit var fingerprintManager: FingerprintManager

    @Mock lateinit var windowManager: WindowManager
@@ -138,7 +138,8 @@ class SideFpsControllerTest : SysuiTestCase() { 
        keyguardBouncerRepository = FakeKeyguardBouncerRepository()

        alternateBouncerInteractor =

            AlternateBouncerInteractor(

                keyguardStateController,

                mock(StatusBarStateController::class.java),

                mock(KeyguardStateController::class.java),

                keyguardBouncerRepository,

                FakeBiometricSettingsRepository(),

                FakeDeviceEntryFingerprintAuthRepository(),

packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsKeyguardViewControllerWithCoroutinesTest.kt

+2 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ import com.android.systemui.keyguard.domain.interactor.PrimaryBouncerCallbackInt 
import com.android.systemui.keyguard.domain.interactor.PrimaryBouncerInteractor

import com.android.systemui.keyguard.shared.constants.KeyguardBouncerConstants

import com.android.systemui.log.table.TableLogBuffer

import com.android.systemui.plugins.statusbar.StatusBarStateController

import com.android.systemui.statusbar.StatusBarState

import com.android.systemui.statusbar.phone.KeyguardBypassController

import com.android.systemui.statusbar.policy.KeyguardStateController
@@ -93,6 +94,7 @@ class UdfpsKeyguardViewControllerWithCoroutinesTest : UdfpsKeyguardViewControlle 
            )

        mAlternateBouncerInteractor =

            AlternateBouncerInteractor(

                mock(StatusBarStateController::class.java),

                mock(KeyguardStateController::class.java),

                keyguardBouncerRepository,

                mock(BiometricSettingsRepository::class.java),

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

+12 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import com.android.systemui.keyguard.data.repository.FakeDeviceEntryFingerprintA 
import com.android.systemui.keyguard.data.repository.KeyguardBouncerRepository

import com.android.systemui.keyguard.data.repository.KeyguardBouncerRepositoryImpl

import com.android.systemui.log.table.TableLogBuffer

import com.android.systemui.plugins.statusbar.StatusBarStateController

import com.android.systemui.statusbar.policy.KeyguardStateController

import com.android.systemui.util.mockito.whenever

import com.android.systemui.util.time.FakeSystemClock
@@ -54,6 +55,7 @@ class AlternateBouncerInteractorTest : SysuiTestCase() { 
    private lateinit var biometricSettingsRepository: FakeBiometricSettingsRepository

    private lateinit var deviceEntryFingerprintAuthRepository:

        FakeDeviceEntryFingerprintAuthRepository

    @Mock private lateinit var statusBarStateController: StatusBarStateController

    @Mock private lateinit var keyguardStateController: KeyguardStateController

    @Mock private lateinit var systemClock: SystemClock

    @Mock private lateinit var keyguardUpdateMonitor: KeyguardUpdateMonitor
@@ -75,6 +77,7 @@ class AlternateBouncerInteractorTest : SysuiTestCase() { 
        featureFlags = FakeFeatureFlags().apply { this.set(Flags.MODERN_ALTERNATE_BOUNCER, true) }

        underTest =

            AlternateBouncerInteractor(

                statusBarStateController,

                keyguardStateController,

                bouncerRepository,

                biometricSettingsRepository,
@@ -131,6 +134,14 @@ class AlternateBouncerInteractorTest : SysuiTestCase() { 
        assertFalse(underTest.canShowAlternateBouncerForFingerprint())

    }



    @Test

    fun canShowAlternateBouncerForFingerprint_isDozing() {

        givenCanShowAlternateBouncer()

        whenever(statusBarStateController.isDozing).thenReturn(true)



        assertFalse(underTest.canShowAlternateBouncerForFingerprint())

    }



    @Test

    fun show_whenCanShow() {

        givenCanShowAlternateBouncer()
@@ -214,6 +225,7 @@ class AlternateBouncerInteractorTest : SysuiTestCase() { 
        biometricSettingsRepository.setFingerprintEnabledByDevicePolicy(true)

        deviceEntryFingerprintAuthRepository.setLockedOut(false)

        whenever(keyguardStateController.isUnlocked).thenReturn(false)

        whenever(statusBarStateController.isDozing).thenReturn(false)

    }



    private fun givenCannotShowAlternateBouncer() {