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

Commit 934238ff authored by Philip P. Moltmann's avatar Philip P. Moltmann Committed by android-build-merger
Browse files

Merge changes from topics 'AutofillContext2', 'AutofillContext' into oc-dev 

am: dd91a563

Change-Id: I1b75b8e8ef125620817a1baaea0431b041871bae
parents 2fcba5d9 dd91a563

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -37084,9 +37084,9 @@ package android.service.autofill { 
  public final class FillRequest implements android.os.Parcelable {

    method public int describeContents();

    method public android.os.Bundle getClientState();

    method public java.util.ArrayList<android.service.autofill.FillContext> getFillContexts();

    method public int getFlags();

    method public int getId();

    method public android.app.assist.AssistStructure getStructure();

    method public void writeToParcel(android.os.Parcel, int);

    field public static final android.os.Parcelable.Creator<android.service.autofill.FillRequest> CREATOR;

    field public static final int FLAG_MANUAL_REQUEST = 1; // 0x1

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -40199,9 +40199,9 @@ package android.service.autofill { 
  public final class FillRequest implements android.os.Parcelable {

    method public int describeContents();

    method public android.os.Bundle getClientState();

    method public java.util.ArrayList<android.service.autofill.FillContext> getFillContexts();

    method public int getFlags();

    method public int getId();

    method public android.app.assist.AssistStructure getStructure();

    method public void writeToParcel(android.os.Parcel, int);

    field public static final android.os.Parcelable.Creator<android.service.autofill.FillRequest> CREATOR;

    field public static final int FLAG_MANUAL_REQUEST = 1; // 0x1

api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -37238,9 +37238,9 @@ package android.service.autofill { 
  public final class FillRequest implements android.os.Parcelable {

    method public int describeContents();

    method public android.os.Bundle getClientState();

    method public java.util.ArrayList<android.service.autofill.FillContext> getFillContexts();

    method public int getFlags();

    method public int getId();

    method public android.app.assist.AssistStructure getStructure();

    method public void writeToParcel(android.os.Parcel, int);

    field public static final android.os.Parcelable.Creator<android.service.autofill.FillRequest> CREATOR;

    field public static final int FLAG_MANUAL_REQUEST = 1; // 0x1

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

+5 −2
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import android.view.autofill.AutofillManager; 


import com.android.internal.os.SomeArgs;



import java.util.ArrayList;

import java.util.List;



/**
@@ -118,8 +119,10 @@ public abstract class AutofillService extends Service { 
                try {

                    onFillRequest(request, cancellation, fillCallback);

                } catch (AbstractMethodError e) {

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

                            request.getFlags(), cancellation, fillCallback);

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

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

                            request.getClientState(), request.getFlags(), cancellation,

                            fillCallback);

                }

                break;

            } case MSG_ON_SAVE_REQUEST: {

core/java/android/service/autofill/FillCallback.java

+6 −1
Original line number Diff line number Diff line
@@ -47,8 +47,13 @@ public final class FillCallback { 
    public void onSuccess(@Nullable FillResponse response) {

        assertNotCalled();

        mCalled = true;



        if (response != null) {

            response.setRequestId(mRequestId);

        }



        try {

            mCallback.onSuccess(response, mRequestId);

            mCallback.onSuccess(response);

        } catch (RemoteException e) {

            e.rethrowAsRuntimeException();

        }