Merge "Resolve the merge conflict with the newest credentials sdk." into udc-dev (c3a4320d) · Commits · e / os / android_frameworks_base

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,

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