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

Commit 08fbfb96 authored by Helen Qin's avatar Helen Qin Committed by Anvesh Renikindi
Browse files

Resolve the merge conflict with the newest credentials sdk. 

Bug: 271887291
Test: local deployment
Change-Id: I262dd0d5cb3f9cc12199a7a40088e39023811fab
parent 18216d97

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

+3 −4
Original line number Diff line number Diff line
@@ -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,

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

+3 −6
Original line number Diff line number Diff line
@@ -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

            )

        }

    }