Merge "Do not crash ui app upon bad provider pending intent." into udc-dev

2023-05-08 04:29:32 +00:00
parent 58897d9b41 b2f96a28bc
commit 8bf2277ff1
1 changed files with 6 additions and 1 deletions
--- a/packages/CredentialManager/src/com/android/credentialmanager/CredentialSelectorViewModel.kt
+++ b/packages/CredentialManager/src/com/android/credentialmanager/CredentialSelectorViewModel.kt
@@ -119,7 +119,12 @@ class CredentialSelectorViewModel(
            uiState = uiState.copy(providerActivityState = ProviderActivityState.PENDING)
            val intentSenderRequest = IntentSenderRequest.Builder(entry.pendingIntent)
                .setFillInIntent(entry.fillInIntent).build()
-            launcher.launch(intentSenderRequest)
+            try {
+                launcher.launch(intentSenderRequest)
+            } catch (e: Exception) {
+                Log.w(Constants.LOG_TAG, "Failed to launch provider UI: $e")
+                onInternalError()
+            }
        } else {
            Log.d(Constants.LOG_TAG, "No provider UI to launch")
            onInternalError()