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

Commit 8bba611b authored Jul 07, 2023 by Joe Bolinger Committed by Android (Google) Code Review Jul 07, 2023

Merge "Set password field user before showing IME." into udc-qpr-dev

parents ed4179c6 badaf167

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -23,7 +23,7 @@ import com.android.systemui.biometrics.Utils
		import com.android.systemui.biometrics.data.repository.PromptRepository
		import com.android.systemui.biometrics.domain.model.BiometricOperationInfo
		import com.android.systemui.biometrics.domain.model.BiometricPromptRequest
		import com.android.systemui.biometrics.domain.model.BiometricUserInfo
		import com.android.systemui.biometrics.shared.model.BiometricUserInfo
		import com.android.systemui.biometrics.shared.model.PromptKind
		import com.android.systemui.dagger.qualifiers.Background
		import javax.inject.Inject

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -25,7 +25,7 @@ import com.android.systemui.biometrics.data.repository.PromptRepository
		import com.android.systemui.biometrics.domain.model.BiometricModalities
		import com.android.systemui.biometrics.domain.model.BiometricOperationInfo
		import com.android.systemui.biometrics.domain.model.BiometricPromptRequest
		import com.android.systemui.biometrics.domain.model.BiometricUserInfo
		import com.android.systemui.biometrics.shared.model.BiometricUserInfo
		import com.android.systemui.biometrics.shared.model.PromptKind
		import com.android.systemui.dagger.SysUISingleton
		import javax.inject.Inject

packages/SystemUI/src/com/android/systemui/biometrics/domain/model/BiometricPromptRequest.kt

+1 −0

Original line number	Diff line number	Diff line
		package com.android.systemui.biometrics.domain.model

		import android.hardware.biometrics.PromptInfo
		import com.android.systemui.biometrics.shared.model.BiometricUserInfo

		/**
		* Preferences for BiometricPrompt, such as title & description, that are immutable while the prompt

packages/SystemUI/src/com/android/systemui/biometrics/domain/model/BiometricUserInfo.kt

deleted100644 → 0

+0 −7

Original line number	Diff line number	Diff line
		package com.android.systemui.biometrics.domain.model

		/** Metadata about the current user BiometricPrompt is being shown to. */
		data class BiometricUserInfo(
		val userId: Int,
		val deviceCredentialOwnerId: Int = userId,
		)

packages/SystemUI/src/com/android/systemui/biometrics/shared/model/BiometricUserInfo.kt

0 → 100644

+12 −0

Original line number	Diff line number	Diff line
		package com.android.systemui.biometrics.shared.model

		/**
		* Metadata about the current user BiometricPrompt is being shown to.
		*
		* If the user's fallback credential is owned by another profile user the [deviceCredentialOwnerId]
		* will differ from the user's [userId].
		*/
		data class BiometricUserInfo(
		val userId: Int,
		val deviceCredentialOwnerId: Int = userId,
		)