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

Commit a2cc69a3 authored by shuanghao's avatar shuanghao
Browse files

Make Intent.getCredentialProviderDataList return CreateCredentialProviderData... 

Make Intent.getCredentialProviderDataList return CreateCredentialProviderData instead of general ProviderData

Test: It builds.
Change-Id: Iac15cd594a8265d766dbb4908bf6073a67752a32
parent a5766dab

packages/CredentialManager/shared/src/com/android/credentialmanager/ktx/IntentKtx.kt

+4 −4
Original line number Diff line number Diff line
@@ -37,17 +37,17 @@ val Intent.requestInfo: RequestInfo? 
        RequestInfo::class.java

    )



val Intent.getCredentialProviderDataList: List<ProviderData>

val Intent.getCredentialProviderDataList: List<GetCredentialProviderData>

    get() = this.extras?.getParcelableArrayList(

        ProviderData.EXTRA_ENABLED_PROVIDER_DATA_LIST,

        GetCredentialProviderData::class.java

    ) ?: emptyList()

    ) ?.filterIsInstance<GetCredentialProviderData>() ?: emptyList()



val Intent.createCredentialProviderDataList: List<ProviderData>

val Intent.createCredentialProviderDataList: List<CreateCredentialProviderData>

    get() = this.extras?.getParcelableArrayList(

        ProviderData.EXTRA_ENABLED_PROVIDER_DATA_LIST,

        CreateCredentialProviderData::class.java

    ) ?: emptyList()

    ) ?.filterIsInstance<CreateCredentialProviderData>() ?: emptyList()



val Intent.resultReceiver: ResultReceiver?

    get() = this.getParcelableExtra(

packages/CredentialManager/shared/src/com/android/credentialmanager/mapper/RequestGetMapper.kt

+4 −7
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.credentialmanager.mapper 


import android.content.Intent

import android.credentials.ui.Entry

import android.credentials.ui.GetCredentialProviderData

import androidx.credentials.provider.PasswordCredentialEntry

import com.android.credentialmanager.factory.fromSlice

import com.android.credentialmanager.ktx.getCredentialProviderDataList
@@ -32,14 +31,12 @@ import com.google.common.collect.ImmutableMap 
fun Intent.toGet(): Request.Get {

    val credentialEntries = mutableListOf<Pair<String, Entry>>()

    for (providerData in getCredentialProviderDataList) {

        if (providerData is GetCredentialProviderData) {

        for (credentialEntry in providerData.credentialEntries) {

            credentialEntries.add(

                Pair(providerData.providerFlattenedComponentName, credentialEntry)

            )

        }

    }

    }



    val passwordEntries = mutableListOf<Password>()

    for ((providerId, entry) in credentialEntries) {