diff options
3 files changed, 6 insertions, 4 deletions
diff --git a/packages/CredentialManager/src/com/android/credentialmanager/DataConverter.kt b/packages/CredentialManager/src/com/android/credentialmanager/DataConverter.kt index bea1e5943461..830bc7a11bda 100644 --- a/packages/CredentialManager/src/com/android/credentialmanager/DataConverter.kt +++ b/packages/CredentialManager/src/com/android/credentialmanager/DataConverter.kt @@ -100,7 +100,7 @@ class GetFlowUtils { userName = credentialEntryUi.userName.toString(), displayName = credentialEntryUi.userDisplayName?.toString(), // TODO: proper fallback - icon = credentialEntryUi.entryIcon.loadDrawable(context) + icon = credentialEntryUi.entryIcon?.loadDrawable(context) ?: context.getDrawable(R.drawable.ic_passkey)!!, lastUsedTimeMillis = credentialEntryUi.lastUsedTimeMillis, ) diff --git a/packages/CredentialManager/src/com/android/credentialmanager/jetpack/provider/CredentialEntryUi.kt b/packages/CredentialManager/src/com/android/credentialmanager/jetpack/provider/CredentialEntryUi.kt index dfbcae119fa0..1693eb629b1b 100644 --- a/packages/CredentialManager/src/com/android/credentialmanager/jetpack/provider/CredentialEntryUi.kt +++ b/packages/CredentialManager/src/com/android/credentialmanager/jetpack/provider/CredentialEntryUi.kt @@ -30,7 +30,7 @@ class CredentialEntryUi( val credentialTypeDisplayName: CharSequence, val userName: CharSequence, val userDisplayName: CharSequence?, - val entryIcon: Icon, + val entryIcon: Icon?, val lastUsedTimeMillis: Long?, val note: CharSequence?, ) { @@ -62,7 +62,7 @@ class CredentialEntryUi( } return CredentialEntryUi( - credentialType, credentialTypeDisplayName!!, userName!!, userDisplayName, entryIcon!!, + credentialType, credentialTypeDisplayName!!, userName!!, userDisplayName, entryIcon, lastUsedTimeMillis, note, ) } diff --git a/services/credentials/java/com/android/server/credentials/CredentialManagerUi.java b/services/credentials/java/com/android/server/credentials/CredentialManagerUi.java index 7408f9ceb97d..b295679b0a53 100644 --- a/services/credentials/java/com/android/server/credentials/CredentialManagerUi.java +++ b/services/credentials/java/com/android/server/credentials/CredentialManagerUi.java @@ -31,6 +31,7 @@ import android.util.Log; import android.util.Slog; import java.util.ArrayList; +import java.util.UUID; /** Initiates the Credential Manager UI and receives results. */ public class CredentialManagerUi { @@ -89,7 +90,8 @@ public class CredentialManagerUi { RequestInfo requestInfo, ArrayList<ProviderData> providerDataList) { Log.i(TAG, "In createPendingIntent"); Intent intent = IntentFactory.newIntent(requestInfo, providerDataList, new ArrayList<>(), - mResultReceiver).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + mResultReceiver) + .setAction(UUID.randomUUID().toString()); //TODO: Determine if a specific request code is needed return PendingIntent.getActivity( mContext, /*requestCode=*/0, intent, PendingIntent.FLAG_IMMUTABLE); |