From 08fbfb9649bf4cfecaba356941c00ed69957ac08 Mon Sep 17 00:00:00 2001
From: Helen Qin <helenqin@google.com>
Date: Mon, 6 Mar 2023 22:34:36 +0000
Subject: [PATCH] Resolve the merge conflict with the newest credentials sdk.

Bug: 271887291
Test: local deployment
Change-Id: I262dd0d5cb3f9cc12199a7a40088e39023811fab
---
 .../src/com/android/credentialmanager/DataConverter.kt   | 7 +++----
 .../src/com/android/credentialmanager/TestUtils.kt       | 9 +++------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/packages/CredentialManager/src/com/android/credentialmanager/DataConverter.kt b/packages/CredentialManager/src/com/android/credentialmanager/DataConverter.kt
index e61633f441f7d..b5c8989de6182 100644
--- a/packages/CredentialManager/src/com/android/credentialmanager/DataConverter.kt
+++ b/packages/CredentialManager/src/com/android/credentialmanager/DataConverter.kt
@@ -60,8 +60,7 @@ import androidx.credentials.provider.CreateEntry
 import androidx.credentials.provider.CustomCredentialEntry
 import androidx.credentials.provider.PasswordCredentialEntry
 import androidx.credentials.provider.PublicKeyCredentialEntry
-import androidx.credentials.provider.RemoteCreateEntry
-import androidx.credentials.provider.RemoteCredentialEntry
+import androidx.credentials.provider.RemoteEntry
 import org.json.JSONObject
 
 // TODO: remove all !! checks
@@ -336,7 +335,7 @@ class GetFlowUtils {
             if (remoteEntry == null) {
                 return null
             }
-            val structuredRemoteEntry = RemoteCredentialEntry.fromSlice(remoteEntry.slice)
+            val structuredRemoteEntry = RemoteEntry.fromSlice(remoteEntry.slice)
                 ?: return null
             return RemoteEntryInfo(
                 providerId = providerId,
@@ -628,7 +627,7 @@ class CreateFlowUtils {
             remoteEntry: Entry?,
         ): RemoteInfo? {
             return if (remoteEntry != null) {
-                val structuredRemoteEntry = RemoteCreateEntry.fromSlice(remoteEntry.slice)
+                val structuredRemoteEntry = RemoteEntry.fromSlice(remoteEntry.slice)
                     ?: return null
                 RemoteInfo(
                     providerId = providerId,
diff --git a/packages/CredentialManager/src/com/android/credentialmanager/TestUtils.kt b/packages/CredentialManager/src/com/android/credentialmanager/TestUtils.kt
index 82d6952bf826d..26aadd9d5deed 100644
--- a/packages/CredentialManager/src/com/android/credentialmanager/TestUtils.kt
+++ b/packages/CredentialManager/src/com/android/credentialmanager/TestUtils.kt
@@ -32,8 +32,7 @@ import androidx.credentials.provider.BeginGetPublicKeyCredentialOption
 import androidx.credentials.provider.CreateEntry
 import androidx.credentials.provider.PasswordCredentialEntry
 import androidx.credentials.provider.PublicKeyCredentialEntry
-import androidx.credentials.provider.RemoteCreateEntry
-import androidx.credentials.provider.RemoteCredentialEntry
+import androidx.credentials.provider.RemoteEntry
 
 import java.time.Instant
 
@@ -85,9 +84,7 @@ class GetTestUtils {
             return Entry(
                 key,
                 subkey,
-                RemoteCredentialEntry(pendingIntent, BeginGetPublicKeyCredentialOption(
-                    Bundle(), "id", "requestjson"
-                )).slice
+                RemoteEntry(pendingIntent).slice
             )
         }
 
@@ -244,7 +241,7 @@ class CreateTestUtils {
             return Entry(
                 key,
                 subkey,
-                RemoteCreateEntry(pendingIntent).slice
+                RemoteEntry(pendingIntent).slice
             )
         }
     }