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

Commit a29c4196 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Sync action entry selection behavior with credential entry" into udc-dev am: 51aa1772 

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



Change-Id: I06f77c7a76c0a0e058556585fb9723563db0303e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c12862e2 51aa1772

services/credentials/java/com/android/server/credentials/ProviderGetSession.java

+4 −21
Original line number Diff line number Diff line
@@ -415,25 +415,8 @@ public final class ProviderGetSession extends ProviderSession<BeginGetCredential 
    /** Returns true if either an exception or a response is found. */

    private void onActionEntrySelected(ProviderPendingIntentResponse

            providerPendingIntentResponse) {

        // Action entry is expected to either contain the final GetCredentialResponse, or it is

        // also acceptable if it does not contain anything. In the second case, we re-show this

        // action on the UI.

        if (providerPendingIntentResponse == null) {

            Log.i(TAG, "providerPendingIntentResponse is null");

            return;

        }



        GetCredentialException exception = maybeGetPendingIntentException(

                providerPendingIntentResponse);

        if (exception != null) {

            invokeCallbackWithError(exception.getType(), exception.getMessage());

        }

        GetCredentialResponse response = PendingIntentResultHandler

                .extractGetCredentialResponse(

                        providerPendingIntentResponse.getResultData());

        if (response != null) {

            mCallbacks.onFinalResponseReceived(mComponentName, response);

        }

        Log.i(TAG, "onActionEntrySelected");

        onCredentialEntrySelected(providerPendingIntentResponse);

    }
@@ -450,11 +433,11 @@ public final class ProviderGetSession extends ProviderSession<BeginGetCredential 


    /**

     * When an invalid state occurs, e.g. entry mismatch or no response from provider,

     * we send back a TYPE_UNKNOWN error as to the developer.

     * we send back a TYPE_NO_CREDENTIAL error as to the developer.

     */

    private void invokeCallbackOnInternalInvalidState() {

        mCallbacks.onFinalErrorReceived(mComponentName,

                GetCredentialException.TYPE_UNKNOWN, null);

                GetCredentialException.TYPE_NO_CREDENTIAL, null);

    }



    /** Update auth entries status based on an auth entry selected from a different session. */