From a1d462fb550b5744b0ff70b50523622f48341afc Mon Sep 17 00:00:00 2001 From: Reema Bajwa Date: Thu, 1 Jun 2023 18:15:36 +0000 Subject: [PATCH] Add auto-select bit to provider's pending intent Bug: 285390594 Test: Built & deployed locally Change-Id: I7bf43827585b3f4d49284ed93cfa666aa27ee367 --- .../android/credentialmanager/CredentialSelectorViewModel.kt | 4 +++- .../src/com/android/credentialmanager/common/Constants.kt | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/CredentialManager/src/com/android/credentialmanager/CredentialSelectorViewModel.kt b/packages/CredentialManager/src/com/android/credentialmanager/CredentialSelectorViewModel.kt index cf962d1d94aaa..bce86c477e772 100644 --- a/packages/CredentialManager/src/com/android/credentialmanager/CredentialSelectorViewModel.kt +++ b/packages/CredentialManager/src/com/android/credentialmanager/CredentialSelectorViewModel.kt @@ -118,8 +118,10 @@ class CredentialSelectorViewModel( if (entry != null && entry.pendingIntent != null) { Log.d(Constants.LOG_TAG, "Launching provider activity") uiState = uiState.copy(providerActivityState = ProviderActivityState.PENDING) + val entryIntent = entry.fillInIntent + entryIntent?.putExtra(Constants.IS_AUTO_SELECTED_KEY, uiState.isAutoSelectFlow) val intentSenderRequest = IntentSenderRequest.Builder(entry.pendingIntent) - .setFillInIntent(entry.fillInIntent).build() + .setFillInIntent(entryIntent).build() try { launcher.launch(intentSenderRequest) } catch (e: Exception) { diff --git a/packages/CredentialManager/src/com/android/credentialmanager/common/Constants.kt b/packages/CredentialManager/src/com/android/credentialmanager/common/Constants.kt index c6dc5945d8868..51ca5971cec44 100644 --- a/packages/CredentialManager/src/com/android/credentialmanager/common/Constants.kt +++ b/packages/CredentialManager/src/com/android/credentialmanager/common/Constants.kt @@ -21,5 +21,6 @@ class Constants { const val LOG_TAG = "CredentialSelector" const val BUNDLE_KEY_PREFER_IMMEDIATELY_AVAILABLE_CREDENTIALS = "androidx.credentials.BUNDLE_KEY_IS_AUTO_SELECT_ALLOWED" + const val IS_AUTO_SELECTED_KEY = "IS_AUTO_SELECTED" } -} \ No newline at end of file +}