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

Commit 1dae1460 authored by Reema Bajwa's avatar Reema Bajwa Committed by Android (Google) Code Review
Browse files

Merge "Hide auth entry if there are no credentials retrieved from it"

parents fc5d5c6e 1e875ddb

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

+11 −2
Original line number Diff line number Diff line
@@ -375,6 +375,11 @@ public final class ProviderGetSession extends ProviderSession<BeginGetCredential 
    private void onAuthenticationEntrySelected(

            @Nullable ProviderPendingIntentResponse providerPendingIntentResponse) {

        //TODO: Other provider intent statuses

        if (providerPendingIntentResponse == null) {

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

            onUpdateEmptyResponse();

        }



        GetCredentialException exception = maybeGetPendingIntentException(

                providerPendingIntentResponse);

        if (exception != null) {
@@ -393,7 +398,7 @@ public final class ProviderGetSession extends ProviderSession<BeginGetCredential 
        }



        Log.i(TAG, "No error or respond found in pending intent response");

        invokeCallbackOnInternalInvalidState();

        onUpdateEmptyResponse();

    }



    private void onActionEntrySelected(ProviderPendingIntentResponse
@@ -415,12 +420,16 @@ public final class ProviderGetSession extends ProviderSession<BeginGetCredential 
        }

    }



    private void onUpdateEmptyResponse() {

        updateStatusAndInvokeCallback(Status.NO_CREDENTIALS);

    }



    @Nullable

    private GetCredentialException maybeGetPendingIntentException(

            ProviderPendingIntentResponse pendingIntentResponse) {

        if (pendingIntentResponse == null) {

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

            return new GetCredentialException(GetCredentialException.TYPE_NO_CREDENTIAL);

            return null;

        }

        if (PendingIntentResultHandler.isValidResponse(pendingIntentResponse)) {

            GetCredentialException exception = PendingIntentResultHandler

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

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ public abstract class ProviderSession<T, R> 
        PENDING_INTENT_INVOKED,

        CREDENTIAL_RECEIVED_FROM_SELECTION,

        SAVE_ENTRIES_RECEIVED, CANCELED,

        COMPLETE

        NO_CREDENTIALS, COMPLETE

    }



    /** Converts exception to a provider session status. */