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

Commit 4aec4731 authored by Anvesh Renikindi's avatar Anvesh Renikindi Committed by Automerger Merge Worker
Browse files

Merge "Fix build failure due to the new credentials sdk drop" into udc-dev am: c6195cdc 

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



Change-Id: Id32e66d798c45daf6a1f31cdc783d3187f932c08
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 05110aef c6195cdc

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

+4 −2
Original line number Diff line number Diff line
@@ -198,7 +198,8 @@ class GetFlowUtils { 
                    it.type,

                    it.credentialRetrievalData,

                    it.credentialRetrievalData,

                    it.isSystemProviderRequired

                    it.isSystemProviderRequired,

                    it.allowedProviders,

                )

                if (credentialOptionJetpack is GetPublicKeyCredentialOption) {

                    credentialOptionJetpack.preferImmediatelyAvailableCredentials
@@ -462,7 +463,8 @@ class CreateFlowUtils { 
                createCredentialRequest.type,

                createCredentialRequest.credentialData,

                createCredentialRequest.candidateQueryData,

                createCredentialRequest.isSystemProviderRequired

                createCredentialRequest.isSystemProviderRequired,

                createCredentialRequest.origin,

            )

            val appPreferredDefaultProviderId: String? =

                if (!requestInfo.hasPermissionToOverrideDefault()) null