Merge "Don't make an IPC to set the initialValue of isFingerprintEnabledByDevicePolicy" into main (d537d6d7) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/keyguard/data/repository/BiometricSettingsRepository.kt

+8 −17

Original line number	Original line	Diff line number	Diff line
	@@ -175,7 +175,6 @@ constructor(
	pw.println("isFingerprintAuthCurrentlyAllowed=${isFingerprintAuthCurrentlyAllowed.value}")		pw.println("isFingerprintAuthCurrentlyAllowed=${isFingerprintAuthCurrentlyAllowed.value}")
	pw.println("isNonStrongBiometricAllowed=${isNonStrongBiometricAllowed.value}")		pw.println("isNonStrongBiometricAllowed=${isNonStrongBiometricAllowed.value}")
	pw.println("isStrongBiometricAllowed=${isStrongBiometricAllowed.value}")		pw.println("isStrongBiometricAllowed=${isStrongBiometricAllowed.value}")
	pw.println("isFingerprintEnabledByDevicePolicy=${isFingerprintEnabledByDevicePolicy.value}")
	}		}

	/** UserId of the current selected user. */		/** UserId of the current selected user. */
	@@ -324,22 +323,14 @@ constructor(
	else isNonStrongBiometricAllowed		else isNonStrongBiometricAllowed
	}		}

	private val isFingerprintEnabledByDevicePolicy: StateFlow<Boolean> =		private val isFingerprintEnabledByDevicePolicy: Flow<Boolean> =
	selectedUserId		selectedUserId.flatMapLatest { userId ->
	.flatMapLatest { userId ->
	devicePolicyChangedForAllUsers		devicePolicyChangedForAllUsers
	.transformLatest { emit(devicePolicyManager.isFingerprintDisabled(userId)) }		.transformLatest { emit(devicePolicyManager.isFingerprintDisabled(userId)) }
			.onStart { emit(devicePolicyManager.isFingerprintDisabled(userId)) }
	.flowOn(backgroundDispatcher)		.flowOn(backgroundDispatcher)
	.distinctUntilChanged()		.distinctUntilChanged()
	}		}
	.stateIn(
	scope,
	started = SharingStarted.Eagerly,
	initialValue =
	devicePolicyManager.isFingerprintDisabled(
	userRepository.getSelectedUserInfo().id
	)
	)

	override val isFingerprintEnrolledAndEnabled: StateFlow<Boolean> =		override val isFingerprintEnrolledAndEnabled: StateFlow<Boolean> =
	isFingerprintEnrolled		isFingerprintEnrolled