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

Merge "Add auto-select bit to provider's pending intent" into udc-dev am: 4cafcf40b1

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23519709

Change-Id: Ibca3fc1d4b2831586e31bcceb2fdd0d2cdffbda6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Reema Bajwa
2023-06-02 17:06:23 +00:00
committed by Automerger Merge Worker
parent c0b63d309b 4cafcf40b1
commit eae29d6ed8
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/CredentialManager/src/com/android/credentialmanager/CredentialSelectorViewModel.kt
View File

@@ -118,8 +118,10 @@ class CredentialSelectorViewModel(
if (entry != null && entry.pendingIntent != null) { if (entry != null && entry.pendingIntent != null) {
Log.d(Constants.LOG_TAG, "Launching provider activity") Log.d(Constants.LOG_TAG, "Launching provider activity")
uiState = uiState.copy(providerActivityState = ProviderActivityState.PENDING) 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) val intentSenderRequest = IntentSenderRequest.Builder(entry.pendingIntent)
.setFillInIntent(entry.fillInIntent).build() .setFillInIntent(entryIntent).build()
try { try {
launcher.launch(intentSenderRequest) launcher.launch(intentSenderRequest)
} catch (e: Exception) { } catch (e: Exception) {

1
packages/CredentialManager/src/com/android/credentialmanager/common/Constants.kt
View File

@@ -21,5 +21,6 @@ class Constants {
const val LOG_TAG = "CredentialSelector" const val LOG_TAG = "CredentialSelector"
const val BUNDLE_KEY_PREFER_IMMEDIATELY_AVAILABLE_CREDENTIALS = const val BUNDLE_KEY_PREFER_IMMEDIATELY_AVAILABLE_CREDENTIALS =
"androidx.credentials.BUNDLE_KEY_IS_AUTO_SELECT_ALLOWED" "androidx.credentials.BUNDLE_KEY_IS_AUTO_SELECT_ALLOWED"
const val IS_AUTO_SELECTED_KEY = "IS_AUTO_SELECTED"
} }
} }