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

Commit a03d712c authored by ELIYAZ MOMIN's avatar ELIYAZ MOMIN Committed by Android (Google) Code Review
Browse files

Revert "Propagate exception from inline/dropdown selections" 

This reverts commit 70e82cf5.

Reason for revert: <Potential culprit for b/335588704  - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.>

Change-Id: I17523162a371319b691073414888186f9884f5de
parent 70e82cf5

core/java/android/service/autofill/AutofillService.java

+3 −2
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ import android.view.ViewStructure; 
import android.view.autofill.AutofillId;

import android.view.autofill.AutofillManager;

import android.view.autofill.AutofillValue;

import android.view.autofill.IAutoFillManagerClient;



import com.android.internal.os.IResultReceiver;
@@ -641,7 +642,7 @@ public abstract class AutofillService extends Service { 


        @Override

        public void onFillCredentialRequest(FillRequest request, IFillCallback callback,

                IBinder autofillClientCallback) {

                IAutoFillManagerClient autofillClientCallback) {

            ICancellationSignal transport = CancellationSignal.createTransport();

            try {

                callback.onCancellable(transport);
@@ -723,7 +724,7 @@ public abstract class AutofillService extends Service { 
     */

    public void onFillCredentialRequest(@NonNull FillRequest request,

            @NonNull CancellationSignal cancellationSignal, @NonNull FillCallback callback,

            @NonNull IBinder autofillClientCallback) {}

            @NonNull IAutoFillManagerClient autofillClientCallback) {}



    /**

     * Called by the Android system to convert a credential manager response to a dataset

core/java/android/service/autofill/IAutoFillService.aidl

+2 −2
Original line number Diff line number Diff line
@@ -16,13 +16,13 @@ 


package android.service.autofill;



import android.os.IBinder;

import android.service.autofill.ConvertCredentialRequest;

import android.service.autofill.IConvertCredentialCallback;

import android.service.autofill.FillRequest;

import android.service.autofill.IFillCallback;

import android.service.autofill.ISaveCallback;

import android.service.autofill.SaveRequest;

import android.view.autofill.IAutoFillManagerClient;

import com.android.internal.os.IResultReceiver;



/**
@@ -34,7 +34,7 @@ oneway interface IAutoFillService { 
    void onConnectedStateChanged(boolean connected);

    void onFillRequest(in FillRequest request, in IFillCallback callback);

    void onFillCredentialRequest(in FillRequest request, in IFillCallback callback,

        in IBinder client);

        in IAutoFillManagerClient client);

    void onSaveRequest(in SaveRequest request, in ISaveCallback callback);

    void onSavedPasswordCountRequest(in IResultReceiver receiver);

    void onConvertCredentialRequest(in ConvertCredentialRequest convertCredentialRequest, in IConvertCredentialCallback convertCredentialCallback);

packages/CredentialManager/src/com/android/credentialmanager/autofill/CredentialAutofillService.kt

+3 −3
Original line number Diff line number Diff line
@@ -47,9 +47,9 @@ import android.service.autofill.SaveRequest 
import android.service.credentials.CredentialProviderService

import android.util.Log

import android.content.Intent

import android.os.IBinder

import android.view.autofill.AutofillId

import android.view.autofill.AutofillManager

import android.view.autofill.IAutoFillManagerClient

import android.widget.RemoteViews

import android.widget.inline.InlinePresentationSpec

import androidx.autofill.inline.v1.InlineSuggestionUi
@@ -95,7 +95,7 @@ class CredentialAutofillService : AutofillService() { 
            request: FillRequest,

            cancellationSignal: CancellationSignal,

            callback: FillCallback,

            autofillCallback: IBinder

            autofillCallback: IAutoFillManagerClient

    ) {

        val context = request.fillContexts

        val structure = context[context.size - 1].structure
@@ -160,7 +160,7 @@ class CredentialAutofillService : AutofillService() { 
                CancellationSignal(),

                Executors.newSingleThreadExecutor(),

                outcome,

                autofillCallback

                autofillCallback.asBinder()

        )

    }

services/autofill/java/com/android/server/autofill/RemoteFillService.java

+3 −2
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ import android.content.Context; 
import android.content.Intent;

import android.content.IntentSender;

import android.os.Handler;

import android.os.IBinder;

import android.os.ICancellationSignal;

import android.os.RemoteException;

import android.service.autofill.AutofillService;
@@ -43,6 +42,7 @@ import android.service.autofill.ISaveCallback; 
import android.service.autofill.SaveRequest;

import android.text.format.DateUtils;

import android.util.Slog;

import android.view.autofill.IAutoFillManagerClient;



import com.android.internal.infra.AbstractRemoteService;

import com.android.internal.infra.ServiceConnector;
@@ -283,7 +283,8 @@ final class RemoteFillService extends ServiceConnector.Impl<IAutoFillService> { 
        return callback;

    }



    public void onFillCredentialRequest(@NonNull FillRequest request, IBinder autofillCallback) {

    public void onFillCredentialRequest(@NonNull FillRequest request,

            IAutoFillManagerClient autofillCallback) {

        if (sVerbose) {

            Slog.v(TAG, "onFillRequest:" + request);

        }

services/autofill/java/com/android/server/autofill/SecondaryProviderHandler.java

+3 −2
Original line number Diff line number Diff line
@@ -21,11 +21,11 @@ import android.annotation.Nullable; 
import android.content.ComponentName;

import android.content.Context;

import android.content.IntentSender;

import android.os.IBinder;

import android.service.autofill.ConvertCredentialResponse;

import android.service.autofill.FillRequest;

import android.service.autofill.FillResponse;

import android.util.Slog;

import android.view.autofill.IAutoFillManagerClient;



/**

 * Requests autofill response from a Remote Autofill Service. This autofill service can be
@@ -105,7 +105,8 @@ final class SecondaryProviderHandler implements RemoteFillService.FillServiceCal 
    /**

     * Requests a new fill response.

     */

    public void onFillRequest(FillRequest pendingFillRequest, int flag, IBinder client) {

    public void onFillRequest(FillRequest pendingFillRequest, int flag,

            IAutoFillManagerClient client) {

        Slog.v(TAG, "Requesting fill response to secondary provider.");

        mLastFlag = flag;

        if (mRemoteFillService != null && mRemoteFillService.isCredentialAutofillService()) {