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

Commit fca9d7a6 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:... 

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

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



Change-Id: I5a823e3f833a459e778fb14f7d5f54d3bbb161cd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 66e4b949 dd8fc0dd

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

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

            uiState = uiState.copy(providerActivityState = ProviderActivityState.PENDING)

            val intentSenderRequest = IntentSenderRequest.Builder(entry.pendingIntent)

            val intentSenderRequest = IntentSenderRequest.Builder(entry.pendingIntent)

                .setFillInIntent(entry.fillInIntent).build()

                .setFillInIntent(entry.fillInIntent).build()

            try {

                launcher.launch(intentSenderRequest)

                launcher.launch(intentSenderRequest)

            } catch (e: Exception) {

                Log.w(Constants.LOG_TAG, "Failed to launch provider UI: $e")

                onInternalError()

            }

        } else {

        } else {

            Log.d(Constants.LOG_TAG, "No provider UI to launch")

            Log.d(Constants.LOG_TAG, "No provider UI to launch")

            onInternalError()

            onInternalError()