Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Honor PreferImmediatelyAvailableCred for password / custom options." into udc-dev am: 127453a476

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

Change-Id: Ia007486ec3bf5f3688a00bcee021fd35fc79b741
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-05-03 06:05:53 +00:00
committed by Automerger Merge Worker
parent 0a0e13ea1a 127453a476
commit 959320b306
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/CredentialManager/src/com/android/credentialmanager/DataConverter.kt
View File

@@ -482,7 +482,8 @@ class CreateFlowUtils {
CredentialType.PASSWORD, CredentialType.PASSWORD,
appLabel, appLabel,
context.getDrawable(R.drawable.ic_password_24) ?: return null, context.getDrawable(R.drawable.ic_password_24) ?: return null,
preferImmediatelyAvailableCredentials = false, preferImmediatelyAvailableCredentials =
createCredentialRequestJetpack.preferImmediatelyAvailableCredentials,
appPreferredDefaultProviderId = appPreferredDefaultProviderId, appPreferredDefaultProviderId = appPreferredDefaultProviderId,
userSetDefaultProviderIds = requestInfo.defaultProviderIds.toSet(), userSetDefaultProviderIds = requestInfo.defaultProviderIds.toSet(),
) )
@@ -509,7 +510,8 @@ class CreateFlowUtils {
appName = appLabel, appName = appLabel,
typeIcon = displayInfo.credentialTypeIcon?.loadDrawable(context) typeIcon = displayInfo.credentialTypeIcon?.loadDrawable(context)
?: context.getDrawable(R.drawable.ic_other_sign_in_24) ?: return null, ?: context.getDrawable(R.drawable.ic_other_sign_in_24) ?: return null,
preferImmediatelyAvailableCredentials = false, preferImmediatelyAvailableCredentials =
createCredentialRequestJetpack.preferImmediatelyAvailableCredentials,
appPreferredDefaultProviderId = appPreferredDefaultProviderId, appPreferredDefaultProviderId = appPreferredDefaultProviderId,
userSetDefaultProviderIds = requestInfo.defaultProviderIds.toSet(), userSetDefaultProviderIds = requestInfo.defaultProviderIds.toSet(),
) )