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

Commit 8e377271 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Made AutofillId.withoutSession is testable." into rvc-dev am:... 

Merge "Merge "Made AutofillId.withoutSession is testable." into rvc-dev am: 234a31e2 am: d199a422" into rvc-d1-dev-plus-aosp
parents 4361f478 1a990d96

api/test-current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -5266,6 +5266,7 @@ package android.view.autofill { 
    ctor public AutofillId(int, int);

    ctor public AutofillId(int, int);

    ctor public AutofillId(@NonNull android.view.autofill.AutofillId, long, int);

    ctor public AutofillId(@NonNull android.view.autofill.AutofillId, long, int);

    method public boolean equalsIgnoreSession(@Nullable android.view.autofill.AutofillId);

    method public boolean equalsIgnoreSession(@Nullable android.view.autofill.AutofillId);

    method @NonNull public static android.view.autofill.AutofillId withoutSession(@NonNull android.view.autofill.AutofillId);

  }

  }





  public final class AutofillManager {

  public final class AutofillManager {

core/java/android/view/autofill/AutofillId.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -73,6 +73,8 @@ public final class AutofillId implements Parcelable { 
    }

    }





    /** @hide */

    /** @hide */

    @NonNull

    @TestApi

    public static AutofillId withoutSession(@NonNull AutofillId id) {

    public static AutofillId withoutSession(@NonNull AutofillId id) {

        final int flags = id.mFlags & ~FLAG_HAS_SESSION;

        final int flags = id.mFlags & ~FLAG_HAS_SESSION;

        final long virtualChildId =

        final long virtualChildId =