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

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

Merge "[CredMan] Fixes for the new credentials lib drop." into udc-dev am:... 

Merge "[CredMan] Fixes for the new credentials lib drop." into udc-dev am: b5277686 am: 65e92dff

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



Change-Id: Id707effb1c258fb6c98471468f7fa3c87c7e1c90
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5211ea9f 65e92dff

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -29,7 +29,6 @@ import android.credentials.ui.Entry 
import android.credentials.ui.GetCredentialProviderData

import android.credentials.ui.GetCredentialProviderData

import android.credentials.ui.RequestInfo

import android.credentials.ui.RequestInfo

import android.graphics.drawable.Drawable

import android.graphics.drawable.Drawable

import android.service.credentials.CredentialEntry

import android.text.TextUtils

import android.text.TextUtils

import android.util.Log

import android.util.Log

import com.android.credentialmanager.common.Constants

import com.android.credentialmanager.common.Constants
@@ -57,6 +56,7 @@ import androidx.credentials.PublicKeyCredential.Companion.TYPE_PUBLIC_KEY_CREDEN 
import androidx.credentials.provider.Action

import androidx.credentials.provider.Action

import androidx.credentials.provider.AuthenticationAction

import androidx.credentials.provider.AuthenticationAction

import androidx.credentials.provider.CreateEntry

import androidx.credentials.provider.CreateEntry

import androidx.credentials.provider.CredentialEntry

import androidx.credentials.provider.CustomCredentialEntry

import androidx.credentials.provider.CustomCredentialEntry

import androidx.credentials.provider.PasswordCredentialEntry

import androidx.credentials.provider.PasswordCredentialEntry

import androidx.credentials.provider.PublicKeyCredentialEntry

import androidx.credentials.provider.PublicKeyCredentialEntry

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

+12 −8
Original line number Original line Diff line number Diff line
@@ -84,7 +84,7 @@ class GetTestUtils { 
            return Entry(

            return Entry(

                key,

                key,

                subkey,

                subkey,

                RemoteEntry(pendingIntent).slice

                RemoteEntry.toSlice(RemoteEntry(pendingIntent))

            )

            )

        }

        }
@@ -219,12 +219,16 @@ class CreateTestUtils { 
                key,

                key,

                subkey,

                subkey,

                CreateEntry.toSlice(

                CreateEntry.toSlice(

                    providerUserDisplayName,

                    CreateEntry(

                    null,

                            accountName = providerUserDisplayName,

                    footerDescription,

                            pendingIntent = pendingIntent,

                    lastUsedTime,

                            description = footerDescription,

                    credCountMap,

                            lastUsedTime = lastUsedTime,

                    pendingIntent

                            icon = null,

                            passwordCredentialCount = passwordCount,

                            publicKeyCredentialCount = passkeyCount,

                            totalCredentialCount = totalCredentialCount,

                    )

                ),

                ),

                Intent()

                Intent()

            )

            )
@@ -241,7 +245,7 @@ class CreateTestUtils { 
            return Entry(

            return Entry(

                key,

                key,

                subkey,

                subkey,

                RemoteEntry(pendingIntent).slice

                RemoteEntry.toSlice(RemoteEntry(pendingIntent))

            )

            )

        }

        }

    }

    }