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

Commit aa8a51b0 authored by Helen Qin's avatar Helen Qin Committed by Automerger Merge Worker
Browse files

Merge "Fix the result code when the UI is launched for settings." into udc-dev am: 2fa6eb40 

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



Change-Id: I86ba94003e1d926b872b835bfb8576cccbeac55a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e39eb7bc 2fa6eb40

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

+1 −1
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ class CredentialManagerRepo( 


    // The dialog is canceled because we launched into settings.

    fun onSettingLaunchCancel() {

        onCancel(BaseDialogResult.RESULT_CODE_DIALOG_COMPLETE_WITH_SELECTION)

        onCancel(BaseDialogResult.RESULT_CODE_CANCELED_AND_LAUNCHED_SETTINGS)

    }



    fun onParsingFailureCancel() {