Merge "Improve error message when expecting a non-virtual autofill id." (e255e671) · Commits · e / os / android_frameworks_base

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

+6 −6

Original line number	Diff line number	Diff line
		@@ -47,20 +47,20 @@ public final class AutofillId implements Parcelable {

		/** @hide */
		@TestApi
		public AutofillId(@NonNull AutofillId parent, int virtualChildId) {
		this(FLAG_IS_VIRTUAL_INT, parent.mViewId, virtualChildId, NO_SESSION);
		public AutofillId(@NonNull AutofillId hostId, int virtualChildId) {
		this(FLAG_IS_VIRTUAL_INT, hostId.mViewId, virtualChildId, NO_SESSION);
		}

		/** @hide */
		@TestApi
		public AutofillId(int parentId, int virtualChildId) {
		this(FLAG_IS_VIRTUAL_INT, parentId, virtualChildId, NO_SESSION);
		public AutofillId(int hostId, int virtualChildId) {
		this(FLAG_IS_VIRTUAL_INT, hostId, virtualChildId, NO_SESSION);
		}

		/** @hide */
		@TestApi
		public AutofillId(@NonNull AutofillId parent, long virtualChildId, int sessionId) {
		this(FLAG_IS_VIRTUAL_LONG \| FLAG_HAS_SESSION, parent.mViewId, virtualChildId, sessionId);
		public AutofillId(@NonNull AutofillId hostId, long virtualChildId, int sessionId) {
		this(FLAG_IS_VIRTUAL_LONG \| FLAG_HAS_SESSION, hostId.mViewId, virtualChildId, sessionId);
		}

		private AutofillId(int flags, int parentId, long virtualChildId, int sessionId) {

core/java/android/view/contentcapture/ContentCaptureSession.java

+9 −8

Original line number	Diff line number	Diff line
		@@ -389,7 +389,8 @@ public abstract class ContentCaptureSession implements AutoCloseable {
		*
		* <p>Should only be called by views that handle their own virtual view hierarchy.
		*
		* @param hostId id of the view hosting the virtual hierarchy.
		* @param hostId id of the non-virtual view hosting the virtual view hierarchy (it can be
		* obtained by calling {@link ViewStructure#getAutofillId()}).
		* @param virtualIds ids of the virtual children.
		*
		* @throws IllegalArgumentException if the {@code hostId} is an autofill id for a virtual view.
		@@ -397,7 +398,7 @@ public abstract class ContentCaptureSession implements AutoCloseable {
		*/
		public final void notifyViewsDisappeared(@NonNull AutofillId hostId,
		@NonNull long[] virtualIds) {
		Preconditions.checkArgument(hostId.isNonVirtual(), "parent cannot be virtual");
		Preconditions.checkArgument(hostId.isNonVirtual(), "hostId cannot be virtual: %s", hostId);
		Preconditions.checkArgument(!ArrayUtils.isEmpty(virtualIds), "virtual ids cannot be empty");
		if (!isContentCaptureEnabled()) return;

		@@ -442,18 +443,18 @@ public abstract class ContentCaptureSession implements AutoCloseable {
		* Creates a new {@link AutofillId} for a virtual child, so it can be used to uniquely identify
		* the children in the session.
		*
		* @param parentId id of the virtual view parent (it can be obtained by calling
		* {@link ViewStructure#getAutofillId()} on the parent).
		* @param hostId id of the non-virtual view hosting the virtual view hierarchy (it can be
		* obtained by calling {@link ViewStructure#getAutofillId()}).
		* @param virtualChildId id of the virtual child, relative to the parent.
		*
		* @return if for the virtual child
		*
		* @throws IllegalArgumentException if the {@code parentId} is a virtual child id.
		*/
		public @NonNull AutofillId newAutofillId(@NonNull AutofillId parentId, long virtualChildId) {
		Preconditions.checkNotNull(parentId);
		Preconditions.checkArgument(parentId.isNonVirtual(), "virtual ids cannot have children");
		return new AutofillId(parentId, virtualChildId, getIdAsInt());
		public @NonNull AutofillId newAutofillId(@NonNull AutofillId hostId, long virtualChildId) {
		Preconditions.checkNotNull(hostId);
		Preconditions.checkArgument(hostId.isNonVirtual(), "hostId cannot be virtual: %s", hostId);
		return new AutofillId(hostId, virtualChildId, getIdAsInt());
		}

		/**