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

Commit 25427d62 authored by Joanne Chung's avatar Joanne Chung Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11716078

Change-Id: I490319fb8eff765af7b372165d4d13cde384b007
parents b2fad6bd 234a31e2

api/test-current.txt

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

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

    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 {

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

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



    /** @hide */

    @NonNull

    @TestApi

    public static AutofillId withoutSession(@NonNull AutofillId id) {

        final int flags = id.mFlags & ~FLAG_HAS_SESSION;

        final long virtualChildId =