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

Commit c6195cdc authored by Anvesh Renikindi's avatar Anvesh Renikindi Committed by Android (Google) Code Review
Browse files

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

parents b5728b5f dc8543c3

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