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

Commit 6a77849c authored by Felipe Leme's avatar Felipe Leme
Browse files

Make new onFill/onSave methods abstract. 

Test: CtsAutoFillServiceTestCases pass
Test: manual verification

Bug: 37563972

Change-Id: I1447bcc3ac03b3cbf71362f370abedb9f00152b9
parent 3202c102

api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -37036,8 +37036,8 @@ package android.service.autofill { 
    method public final android.os.IBinder onBind(android.content.Intent);

    method public void onConnected();

    method public void onDisconnected();

    method public void onFillRequest(android.service.autofill.FillRequest, android.os.CancellationSignal, android.service.autofill.FillCallback);

    method public void onSaveRequest(android.service.autofill.SaveRequest, android.service.autofill.SaveCallback);

    method public abstract void onFillRequest(android.service.autofill.FillRequest, android.os.CancellationSignal, android.service.autofill.FillCallback);

    method public abstract void onSaveRequest(android.service.autofill.SaveRequest, android.service.autofill.SaveCallback);

    field public static final java.lang.String SERVICE_INTERFACE = "android.service.autofill.AutofillService";

    field public static final java.lang.String SERVICE_META_DATA = "android.autofill";

  }

api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -40152,8 +40152,8 @@ package android.service.autofill { 
    method public final android.os.IBinder onBind(android.content.Intent);

    method public void onConnected();

    method public void onDisconnected();

    method public void onFillRequest(android.service.autofill.FillRequest, android.os.CancellationSignal, android.service.autofill.FillCallback);

    method public void onSaveRequest(android.service.autofill.SaveRequest, android.service.autofill.SaveCallback);

    method public abstract void onFillRequest(android.service.autofill.FillRequest, android.os.CancellationSignal, android.service.autofill.FillCallback);

    method public abstract void onSaveRequest(android.service.autofill.SaveRequest, android.service.autofill.SaveCallback);

    field public static final java.lang.String SERVICE_INTERFACE = "android.service.autofill.AutofillService";

    field public static final java.lang.String SERVICE_META_DATA = "android.autofill";

  }

api/test-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -37190,8 +37190,8 @@ package android.service.autofill { 
    method public final android.os.IBinder onBind(android.content.Intent);

    method public void onConnected();

    method public void onDisconnected();

    method public void onFillRequest(android.service.autofill.FillRequest, android.os.CancellationSignal, android.service.autofill.FillCallback);

    method public void onSaveRequest(android.service.autofill.SaveRequest, android.service.autofill.SaveCallback);

    method public abstract void onFillRequest(android.service.autofill.FillRequest, android.os.CancellationSignal, android.service.autofill.FillCallback);

    method public abstract void onSaveRequest(android.service.autofill.SaveRequest, android.service.autofill.SaveCallback);

    field public static final java.lang.String SERVICE_INTERFACE = "android.service.autofill.AutofillService";

    field public static final java.lang.String SERVICE_META_DATA = "android.autofill";

  }

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

+19 −12
Original line number Diff line number Diff line
@@ -114,7 +114,13 @@ public abstract class AutofillService extends Service { 
                final IFillCallback callback = (IFillCallback) args.arg3;

                final FillCallback fillCallback = new FillCallback(callback, request.getId());

                args.recycle();

                // TODO(b/37563972): temporary try-catch hack to support old method

                try {

                    onFillRequest(request, cancellation, fillCallback);

                } catch (AbstractMethodError e) {

                    onFillRequest(request.getStructure(), request.getClientState(),

                            request.getFlags(), cancellation, fillCallback);

                }

                break;

            } case MSG_ON_SAVE_REQUEST: {

                final SomeArgs args = (SomeArgs) msg.obj;
@@ -122,7 +128,14 @@ public abstract class AutofillService extends Service { 
                final ISaveCallback callback = (ISaveCallback) args.arg2;

                final SaveCallback saveCallback = new SaveCallback(callback);

                args.recycle();

                // TODO(b/37563972): temporary try-catch hack to support old method

                try {

                    onSaveRequest(request, saveCallback);

                } catch (AbstractMethodError e) {

                    final List<FillContext> contexts = request.getFillContexts();

                    onSaveRequest(contexts.get(contexts.size() - 1).getStructure(),

                            request.getClientState(), saveCallback);

                }

                break;

            } case MSG_DISCONNECT: {

                onDisconnected();
@@ -179,11 +192,8 @@ public abstract class AutofillService extends Service { 
     *     handling this fill request in order to save resources.

     * @param callback object used to notify the result of the request.

     */

    public void onFillRequest(@NonNull FillRequest request,

            @NonNull CancellationSignal cancellationSignal, @NonNull FillCallback callback) {

        onFillRequest(request.getStructure(), request.getClientState(), request.getFlags(),

                cancellationSignal, callback);

    }

    public abstract void onFillRequest(@NonNull FillRequest request,

            @NonNull CancellationSignal cancellationSignal, @NonNull FillCallback callback);



    /**

     * Called by the Android system do decide if an {@link Activity} can be autofilled by the
@@ -225,11 +235,8 @@ public abstract class AutofillService extends Service { 
     *        See {@link FillResponse} for examples of multiple-sections requests.

     * @param callback object used to notify the result of the request.

     */

    public void onSaveRequest(@NonNull SaveRequest request, @NonNull SaveCallback callback) {

        final List<FillContext> contexts = request.getFillContexts();

        onSaveRequest(contexts.get(contexts.size() - 1).getStructure(),

                request.getClientState(), callback);

    }

    public abstract void onSaveRequest(@NonNull SaveRequest request,

            @NonNull SaveCallback callback);



    /**

     * Called when user requests service to save the fields of an {@link Activity}.