Merge "Use renamed APIs" into main (6ef95d6c) · Commits · e / os / android_frameworks_base

packages/CredentialManager/src/com/android/credentialmanager/DataConverter.kt

+5 −5

Original line number	Diff line number	Diff line
		@@ -45,8 +45,8 @@ import androidx.credentials.CreateCredentialRequest
		import androidx.credentials.CreateCustomCredentialRequest
		import androidx.credentials.CreatePasswordRequest
		import androidx.credentials.CreatePublicKeyCredentialRequest
		import androidx.credentials.CredentialOption
		import androidx.credentials.PasswordCredential
		import androidx.credentials.PriorityHints
		import androidx.credentials.PublicKeyCredential
		import androidx.credentials.provider.CreateEntry
		import androidx.credentials.provider.RemoteEntry
		@@ -175,9 +175,9 @@ class GetFlowUtils {
		"androidx.credentials.BUNDLE_KEY_TYPE_PRIORITY_VALUE",
		when (option.type) {
		PasswordCredential.TYPE_PASSWORD_CREDENTIAL ->
		PriorityHints.PRIORITY_PASSWORD_OR_SIMILAR
		CredentialOption.PRIORITY_PASSWORD_OR_SIMILAR
		PublicKeyCredential.TYPE_PUBLIC_KEY_CREDENTIAL -> 100
		else -> PriorityHints.PRIORITY_DEFAULT
		else -> CredentialOption.PRIORITY_DEFAULT
		}
		)
		typePriorityMap[option.type] = priority
		@@ -344,8 +344,8 @@ class CreateFlowUtils {
		}
		is CreateCustomCredentialRequest -> {
		// TODO: directly use the display info once made public
		val displayInfo = CreateCredentialRequest.DisplayInfo
		.parseFromCredentialDataBundle(createCredentialRequest.credentialData)
		val displayInfo = CreateCredentialRequest.DisplayInfo.createFrom(
		createCredentialRequest.credentialData)
		?: return null
		RequestDisplayInfo(
		title = displayInfo.userId.toString(),

+3 −3

Original line number	Diff line number	Diff line
		@@ -18,7 +18,7 @@ package com.android.credentialmanager.getflow

		import android.credentials.flags.Flags.selectorUiImprovementsEnabled
		import android.graphics.drawable.Drawable
		import androidx.credentials.PriorityHints
		import androidx.credentials.CredentialOption
		import com.android.credentialmanager.model.get.ProviderInfo
		import com.android.credentialmanager.model.EntryInfo
		import com.android.credentialmanager.model.get.AuthenticationEntryInfo
		@@ -214,10 +214,10 @@ internal class CredentialEntryInfoComparatorByTypeThenTimestamp(
		// First prefer passkey type for its security benefits
		if (p0.rawCredentialType != p1.rawCredentialType) {
		val p0Priority = typePriorityMap.getOrDefault(
		p0.rawCredentialType, PriorityHints.PRIORITY_DEFAULT
		p0.rawCredentialType, CredentialOption.PRIORITY_DEFAULT
		)
		val p1Priority = typePriorityMap.getOrDefault(
		p1.rawCredentialType, PriorityHints.PRIORITY_DEFAULT
		p1.rawCredentialType, CredentialOption.PRIORITY_DEFAULT
		)
		if (p0Priority < p1Priority) {
		return -1