Merge "[flexiglass] Enables fingerprint unlock while in AOD" into main (1949d7ec) · Commits · e / os / android_frameworks_base

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

+53 −7

Original line number	Diff line number	Diff line
		@@ -31,8 +31,11 @@ import com.android.systemui.flags.fakeSystemPropertiesHelper
		import com.android.systemui.keyguard.data.repository.fakeBiometricSettingsRepository
		import com.android.systemui.keyguard.data.repository.fakeDeviceEntryFaceAuthRepository
		import com.android.systemui.keyguard.data.repository.fakeDeviceEntryFingerprintAuthRepository
		import com.android.systemui.keyguard.data.repository.fakeKeyguardTransitionRepository
		import com.android.systemui.keyguard.data.repository.fakeTrustRepository
		import com.android.systemui.keyguard.domain.interactor.keyguardTransitionInteractor
		import com.android.systemui.keyguard.shared.model.AuthenticationFlags
		import com.android.systemui.keyguard.shared.model.KeyguardState
		import com.android.systemui.keyguard.shared.model.SuccessFingerprintAuthenticationStatus
		import com.android.systemui.kosmos.testScope
		import com.android.systemui.power.domain.interactor.PowerInteractor.Companion.setAsleepForTest
		@@ -211,7 +214,7 @@ class DeviceUnlockedInteractorTest : SysuiTestCase() {
		val deviceUnlockStatus by collectLastValue(underTest.deviceUnlockStatus)
		kosmos.fakeUserRepository.setSelectedUserInfo(
		primaryUser,
		SelectionStatus.SELECTION_COMPLETE
		SelectionStatus.SELECTION_COMPLETE,
		)

		kosmos.fakeTrustRepository.setCurrentUserTrusted(true)
		@@ -239,6 +242,49 @@ class DeviceUnlockedInteractorTest : SysuiTestCase() {
		assertThat(deviceUnlockStatus?.isUnlocked).isFalse()
		}

		@Test
		fun deviceUnlockStatus_becomesUnlocked_whenFingerprintUnlocked_whileDeviceAsleepInAod() =
		testScope.runTest {
		val deviceUnlockStatus by collectLastValue(underTest.deviceUnlockStatus)
		assertThat(deviceUnlockStatus?.isUnlocked).isFalse()

		kosmos.fakeKeyguardTransitionRepository.sendTransitionSteps(
		from = KeyguardState.LOCKSCREEN,
		to = KeyguardState.AOD,
		testScope = this,
		)
		kosmos.powerInteractor.setAsleepForTest()
		runCurrent()

		assertThat(deviceUnlockStatus?.isUnlocked).isFalse()

		kosmos.fakeDeviceEntryFingerprintAuthRepository.setAuthenticationStatus(
		SuccessFingerprintAuthenticationStatus(0, true)
		)
		runCurrent()
		assertThat(deviceUnlockStatus?.isUnlocked).isTrue()
		}

		@Test
		fun deviceUnlockStatus_staysLocked_whenFingerprintUnlocked_whileDeviceAsleep() =
		testScope.runTest {
		val deviceUnlockStatus by collectLastValue(underTest.deviceUnlockStatus)
		assertThat(deviceUnlockStatus?.isUnlocked).isFalse()
		assertThat(kosmos.keyguardTransitionInteractor.getCurrentState())
		.isEqualTo(KeyguardState.LOCKSCREEN)

		kosmos.powerInteractor.setAsleepForTest()
		runCurrent()

		assertThat(deviceUnlockStatus?.isUnlocked).isFalse()

		kosmos.fakeDeviceEntryFingerprintAuthRepository.setAuthenticationStatus(
		SuccessFingerprintAuthenticationStatus(0, true)
		)
		runCurrent()
		assertThat(deviceUnlockStatus?.isUnlocked).isFalse()
		}

		@Test
		fun deviceEntryRestrictionReason_whenFaceOrFingerprintOrTrust_alwaysNull() =
		testScope.runTest {
		@@ -273,7 +319,7 @@ class DeviceUnlockedInteractorTest : SysuiTestCase() {
		LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_USER_LOCKDOWN to
		DeviceEntryRestrictionReason.UserLockdown,
		LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_DPM_LOCK_NOW to
		DeviceEntryRestrictionReason.PolicyLockdown
		DeviceEntryRestrictionReason.PolicyLockdown,
		)
		}

		@@ -285,7 +331,7 @@ class DeviceUnlockedInteractorTest : SysuiTestCase() {
		kosmos.fakeTrustRepository.setTrustUsuallyManaged(false)
		kosmos.fakeSystemPropertiesHelper.set(
		DeviceUnlockedInteractor.SYS_BOOT_REASON_PROP,
		"not mainline reboot"
		"not mainline reboot",
		)
		runCurrent()

		@@ -321,7 +367,7 @@ class DeviceUnlockedInteractorTest : SysuiTestCase() {
		kosmos.fakeTrustRepository.setTrustUsuallyManaged(false)
		kosmos.fakeSystemPropertiesHelper.set(
		DeviceUnlockedInteractor.SYS_BOOT_REASON_PROP,
		"not mainline reboot"
		"not mainline reboot",
		)
		runCurrent()

		@@ -358,7 +404,7 @@ class DeviceUnlockedInteractorTest : SysuiTestCase() {
		kosmos.fakeTrustRepository.setCurrentUserTrustManaged(false)
		kosmos.fakeSystemPropertiesHelper.set(
		DeviceUnlockedInteractor.SYS_BOOT_REASON_PROP,
		"not mainline reboot"
		"not mainline reboot",
		)
		runCurrent()

		@@ -394,12 +440,12 @@ class DeviceUnlockedInteractorTest : SysuiTestCase() {
		collectLastValue(underTest.deviceEntryRestrictionReason)
		kosmos.fakeSystemPropertiesHelper.set(
		DeviceUnlockedInteractor.SYS_BOOT_REASON_PROP,
		DeviceUnlockedInteractor.REBOOT_MAINLINE_UPDATE
		DeviceUnlockedInteractor.REBOOT_MAINLINE_UPDATE,
		)
		kosmos.fakeBiometricSettingsRepository.setAuthenticationFlags(
		AuthenticationFlags(
		userId = 1,
		flag = LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_BOOT
		flag = LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_BOOT,
		)
		)
		runCurrent()

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

+18 −4

Original line number	Diff line number	Diff line
		@@ -26,7 +26,9 @@ import com.android.systemui.deviceentry.shared.model.DeviceEntryRestrictionReaso
		import com.android.systemui.deviceentry.shared.model.DeviceUnlockSource
		import com.android.systemui.deviceentry.shared.model.DeviceUnlockStatus
		import com.android.systemui.flags.SystemPropertiesHelper
		import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractor
		import com.android.systemui.keyguard.domain.interactor.TrustInteractor
		import com.android.systemui.keyguard.shared.model.KeyguardState
		import com.android.systemui.power.domain.interactor.PowerInteractor
		import com.android.systemui.utils.coroutines.flow.flatMapLatestConflated
		import javax.inject.Inject
		@@ -36,6 +38,7 @@ import kotlinx.coroutines.flow.Flow
		import kotlinx.coroutines.flow.SharingStarted
		import kotlinx.coroutines.flow.StateFlow
		import kotlinx.coroutines.flow.combine
		import kotlinx.coroutines.flow.distinctUntilChanged
		import kotlinx.coroutines.flow.filter
		import kotlinx.coroutines.flow.flatMapLatest
		import kotlinx.coroutines.flow.flowOf
		@@ -57,6 +60,7 @@ constructor(
		private val powerInteractor: PowerInteractor,
		private val biometricSettingsInteractor: DeviceEntryBiometricSettingsInteractor,
		private val systemPropertiesHelper: SystemPropertiesHelper,
		keyguardTransitionInteractor: KeyguardTransitionInteractor,
		) {

		private val deviceUnlockSource =
		@@ -74,7 +78,7 @@ constructor(
		trustInteractor.isTrusted.filter { it }.map { DeviceUnlockSource.TrustAgent },
		authenticationInteractor.onAuthenticationResult
		.filter { it }
		.map { DeviceUnlockSource.BouncerInput }
		.map { DeviceUnlockSource.BouncerInput },
		)

		private val faceEnrolledAndEnabled = biometricSettingsInteractor.isFaceAuthEnrolledAndEnabled
		@@ -170,10 +174,20 @@ constructor(
		combine(
		powerInteractor.isAsleep,
		isInLockdown,
		::Pair,
		keyguardTransitionInteractor
		.transitionValue(KeyguardState.AOD)
		.map { it == 1f }
		.distinctUntilChanged(),
		::Triple,
		)
		.flatMapLatestConflated { (isAsleep, isInLockdown) ->
		if (isAsleep \|\| isInLockdown) {
		.flatMapLatestConflated { (isAsleep, isInLockdown, isAod) ->
		val isForceLocked =
		when {
		isAsleep && !isAod -> true
		isInLockdown -> true
		else -> false
		}
		if (isForceLocked) {
		flowOf(DeviceUnlockStatus(false, null))
		} else {
		deviceUnlockSource.map { DeviceUnlockStatus(true, it) }

packages/SystemUI/tests/utils/src/com/android/systemui/deviceentry/domain/interactor/DeviceUnlockedInteractorKosmos.kt

+2 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ import com.android.systemui.authentication.domain.interactor.authenticationInter
		import com.android.systemui.deviceentry.data.repository.deviceEntryRepository
		import com.android.systemui.flags.fakeSystemPropertiesHelper
		import com.android.systemui.flags.systemPropertiesHelper
		import com.android.systemui.keyguard.domain.interactor.keyguardTransitionInteractor
		import com.android.systemui.keyguard.domain.interactor.trustInteractor
		import com.android.systemui.kosmos.Kosmos
		import com.android.systemui.kosmos.Kosmos.Fixture
		@@ -37,5 +38,6 @@ val Kosmos.deviceUnlockedInteractor by Fixture {
		powerInteractor = powerInteractor,
		biometricSettingsInteractor = deviceEntryBiometricSettingsInteractor,
		systemPropertiesHelper = fakeSystemPropertiesHelper,
		keyguardTransitionInteractor = keyguardTransitionInteractor,
		)
		}