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

Commit 44c715a8 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: Idc5993a1b23496a2d5e6f6902e1ea410bab8cd24
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 97c60e1e c6195cdc

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

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

                    it.type,

                    it.credentialRetrievalData,

                    it.credentialRetrievalData,

                    it.credentialRetrievalData,

                    it.credentialRetrievalData,

                    it.isSystemProviderRequired

                    it.isSystemProviderRequired,

                    it.allowedProviders,

                )

                )

                if (credentialOptionJetpack is GetPublicKeyCredentialOption) {

                if (credentialOptionJetpack is GetPublicKeyCredentialOption) {

                    credentialOptionJetpack.preferImmediatelyAvailableCredentials

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

                createCredentialRequest.type,

                createCredentialRequest.credentialData,

                createCredentialRequest.credentialData,

                createCredentialRequest.candidateQueryData,

                createCredentialRequest.candidateQueryData,

                createCredentialRequest.isSystemProviderRequired

                createCredentialRequest.isSystemProviderRequired,

                createCredentialRequest.origin,

            )

            )

            val appPreferredDefaultProviderId: String? =

            val appPreferredDefaultProviderId: String? =

                if (!requestInfo.hasPermissionToOverrideDefault()) null

                if (!requestInfo.hasPermissionToOverrideDefault()) null