Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 992f6196 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I7eb29c3fe603689c08d9f5095ba8bb37827d9d62
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f77dfeb4 8bf2277f

packages/CredentialManager/src/com/android/credentialmanager/CredentialSelectorViewModel.kt

+6 −1
Original line number Diff line number Diff line
@@ -119,7 +119,12 @@ class CredentialSelectorViewModel( 
            uiState = uiState.copy(providerActivityState = ProviderActivityState.PENDING)

            val intentSenderRequest = IntentSenderRequest.Builder(entry.pendingIntent)

                .setFillInIntent(entry.fillInIntent).build()

            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()