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

Commit 458fc096 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Honor PreferImmediatelyAvailableCred for password / custom options."... 

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

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



Change-Id: Id9e6c0e2087abfa633475ec0fc27b0d308d6f624
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fa290038 959320b3

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

+4 −2
Original line number Diff line number Diff line
@@ -482,7 +482,8 @@ class CreateFlowUtils { 
                    CredentialType.PASSWORD,

                    appLabel,

                    context.getDrawable(R.drawable.ic_password_24) ?: return null,

                    preferImmediatelyAvailableCredentials = false,

                    preferImmediatelyAvailableCredentials =

                    createCredentialRequestJetpack.preferImmediatelyAvailableCredentials,

                    appPreferredDefaultProviderId = appPreferredDefaultProviderId,

                    userSetDefaultProviderIds = requestInfo.defaultProviderIds.toSet(),

                )
@@ -509,7 +510,8 @@ class CreateFlowUtils { 
                        appName = appLabel,

                        typeIcon = displayInfo.credentialTypeIcon?.loadDrawable(context)

                            ?: context.getDrawable(R.drawable.ic_other_sign_in_24) ?: return null,

                        preferImmediatelyAvailableCredentials = false,

                        preferImmediatelyAvailableCredentials =

                        createCredentialRequestJetpack.preferImmediatelyAvailableCredentials,

                        appPreferredDefaultProviderId = appPreferredDefaultProviderId,

                        userSetDefaultProviderIds = requestInfo.defaultProviderIds.toSet(),

                    )