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

Commit eacd74de authored by Felipe Leme's avatar Felipe Leme
Browse files

New Autofill API: FillRequest.FLAG_COMPATIBILITY_MODE_REQUEST. 

Test: atest VirtualContainerActivityTest VirtualContainerActivityCompatModeTest
Test: m -j doc-comment-check-docs # and checked HTML

Fixes: 112111649

Change-Id: I2390fd78e330c10b08394c50f14f88211e5f2d80
parent f15bbe2e

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -39073,6 +39073,7 @@ package android.service.autofill { 
    method public int getId();

    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_COMPATIBILITY_MODE_REQUEST = 2; // 0x2

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

  }

























core/java/android/service/autofill/FillRequest.java



+9
−2




























Original line number
Diff line number
Diff line








@@ -65,12 +65,18 @@ public final class FillRequest implements Parcelable {













     */















    public static final int FLAG_MANUAL_REQUEST = 0x1;





























    /**













     * Indicates this request was made using













     * <a href="AutofillService.html#CompatibilityMode">compatibility mode</a>.













     */













    public static final int FLAG_COMPATIBILITY_MODE_REQUEST = 0x2;





























    /** @hide */















    public static final int INVALID_REQUEST_ID = Integer.MIN_VALUE;































    /** @hide */















    @IntDef(flag = true, prefix = { "FLAG_" }, value = {













            FLAG_MANUAL_REQUEST













            FLAG_MANUAL_REQUEST, FLAG_COMPATIBILITY_MODE_REQUEST















    })















    @Retention(RetentionPolicy.SOURCE)















    @interface RequestFlags{}









@@ -93,7 +99,8 @@ public final class FillRequest implements Parcelable {













    public FillRequest(int id, @NonNull ArrayList<FillContext> contexts,















            @Nullable Bundle clientState, @RequestFlags int flags) {















        mId = id;













        mFlags = Preconditions.checkFlagsArgument(flags, FLAG_MANUAL_REQUEST);













        mFlags = Preconditions.checkFlagsArgument(flags,













                FLAG_MANUAL_REQUEST | FLAG_COMPATIBILITY_MODE_REQUEST);















        mContexts = Preconditions.checkCollectionElementsNotNull(contexts, "contexts");















        mClientState = clientState;















    }

































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



+4
−3




























Original line number
Diff line number
Diff line








@@ -287,6 +287,9 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState













                                    componentNameFromApp == null ? "null"















                                            : componentNameFromApp.flattenToShortString()));















                }













                // Flags used to start the session.













                int flags = structure.getFlags();





























                if (mCompatMode) {















                    // Sanitize URL bar, if needed















                    final String[] urlBarIds = mService.getUrlBarResourceIdsForCompatMode(









@@ -307,12 +310,10 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState













                            mViewStates.put(urlBarId, viewState);















                        }















                    }













                    flags |= FillRequest.FLAG_COMPATIBILITY_MODE_REQUEST;















                }















                structure.sanitizeForParceling(true);





























                // Flags used to start the session.













                final int flags = structure.getFlags();





























                if (mContexts == null) {















                    mContexts = new ArrayList<>(1);















                }