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

Commit d83b6017 authored Jun 23, 2020 by Joanne Chung Committed by Automerger Merge Worker Jun 23, 2020

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

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

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

Change-Id: Ifee77dba4556c33abee6fd1ee3230213415880c1

parents 66b517df bd91c743

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 =