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

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

Merge "Fixed build failure caused by the credentials sdk drop" into udc-dev am: 66696765 

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



Change-Id: I17ad9706553150fd22457e7396dd73ec7679b22f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1f7ae9d3 66696765

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

+2 −16
Original line number Diff line number Diff line
@@ -50,9 +50,7 @@ import com.android.credentialmanager.getflow.TopBrandingContent 
import androidx.credentials.CreateCredentialRequest

import androidx.credentials.CreateCustomCredentialRequest

import androidx.credentials.CreatePasswordRequest

import androidx.credentials.CredentialOption

import androidx.credentials.CreatePublicKeyCredentialRequest

import androidx.credentials.GetPublicKeyCredentialOption

import androidx.credentials.PublicKeyCredential.Companion.TYPE_PUBLIC_KEY_CREDENTIAL

import androidx.credentials.provider.Action

import androidx.credentials.provider.AuthenticationAction
@@ -194,20 +192,8 @@ class GetFlowUtils { 
            originName: String?,

        ): com.android.credentialmanager.getflow.RequestDisplayInfo? {

            val getCredentialRequest = requestInfo?.getCredentialRequest ?: return null

            val preferImmediatelyAvailableCredentials = getCredentialRequest.credentialOptions.any {

                val credentialOptionJetpack = CredentialOption.createFrom(

                    it.type,

                    it.credentialRetrievalData,

                    it.credentialRetrievalData,

                    it.isSystemProviderRequired,

                    it.allowedProviders,

                )

                if (credentialOptionJetpack is GetPublicKeyCredentialOption) {

                    credentialOptionJetpack.preferImmediatelyAvailableCredentials

                } else {

                    false

                }

            }

            val preferImmediatelyAvailableCredentials = getCredentialRequest.data.getBoolean(

                "androidx.credentials.BUNDLE_KEY_PREFER_IMMEDIATELY_AVAILABLE_CREDENTIALS")

            val preferUiBrandingComponentName =

                getCredentialRequest.data.getParcelable(

                    "androidx.credentials.BUNDLE_KEY_PREFER_UI_BRANDING_COMPONENT_NAME",