Merge "[CredMan] Fixes for the new credentials lib drop." into udc-dev (b5277686) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -29,7 +29,6 @@ import android.credentials.ui.Entry
		import android.credentials.ui.GetCredentialProviderData
		import android.credentials.ui.RequestInfo
		import android.graphics.drawable.Drawable
		import android.service.credentials.CredentialEntry
		import android.text.TextUtils
		import android.util.Log
		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.AuthenticationAction
		import androidx.credentials.provider.CreateEntry
		import androidx.credentials.provider.CredentialEntry
		import androidx.credentials.provider.CustomCredentialEntry
		import androidx.credentials.provider.PasswordCredentialEntry
		import androidx.credentials.provider.PublicKeyCredentialEntry

+12 −8

Original line number	Diff line number	Diff line
		@@ -84,7 +84,7 @@ class GetTestUtils {
		return Entry(
		key,
		subkey,
		RemoteEntry(pendingIntent).slice
		RemoteEntry.toSlice(RemoteEntry(pendingIntent))
		)
		}

		@@ -219,12 +219,16 @@ class CreateTestUtils {
		key,
		subkey,
		CreateEntry.toSlice(
		providerUserDisplayName,
		null,
		footerDescription,
		lastUsedTime,
		credCountMap,
		pendingIntent
		CreateEntry(
		accountName = providerUserDisplayName,
		pendingIntent = pendingIntent,
		description = footerDescription,
		lastUsedTime = lastUsedTime,
		icon = null,
		passwordCredentialCount = passwordCount,
		publicKeyCredentialCount = passkeyCount,
		totalCredentialCount = totalCredentialCount,
		)
		),
		Intent()
		)
		@@ -241,7 +245,7 @@ class CreateTestUtils {
		return Entry(
		key,
		subkey,
		RemoteEntry(pendingIntent).slice
		RemoteEntry.toSlice(RemoteEntry(pendingIntent))
		)
		}
		}