Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolve the merge conflict with the newest credentials sdk.

Browse Source 
Bug: 271887291
Test: local deployment
Change-Id: I262dd0d5cb3f9cc12199a7a40088e39023811fab
This commit is contained in:
Helen Qin
2023-03-06 22:34:36 +00:00
committed by Anvesh Renikindi
parent 18216d979b
commit 08fbfb9649
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/CredentialManager/src/com/android/credentialmanager/DataConverter.kt
View File

@@ -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,

9
packages/CredentialManager/src/com/android/credentialmanager/TestUtils.kt
View File

@@ -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
)
}
}