Merge "Re-export with google-java-format --aosp running on all exported classes" (16afc7f4) · Commits · e / os / android_frameworks_base

apex/appsearch/framework/java/android/app/appsearch/AppSearchEmail.java

+57 −73

Original line number	Diff line number	Diff line
		@@ -16,10 +16,8 @@

		package android.app.appsearch;


		import android.annotation.NonNull;
		import android.annotation.Nullable;

		import android.app.appsearch.AppSearchSchema.PropertyConfig;

		/**
		@@ -29,7 +27,6 @@ import android.app.appsearch.AppSearchSchema.PropertyConfig;
		*
		* @hide
		*/

		public class AppSearchEmail extends GenericDocument {
		/** The name of the schema type for {@link AppSearchEmail} documents. */
		public static final String SCHEMA_TYPE = "builtin:Email";
		@@ -41,54 +38,55 @@ public class AppSearchEmail extends GenericDocument {
		private static final String KEY_SUBJECT = "subject";
		private static final String KEY_BODY = "body";

		public static final AppSearchSchema SCHEMA = new AppSearchSchema.Builder(SCHEMA_TYPE)
		.addProperty(new PropertyConfig.Builder(KEY_FROM)
		public static final AppSearchSchema SCHEMA =
		new AppSearchSchema.Builder(SCHEMA_TYPE)
		.addProperty(
		new PropertyConfig.Builder(KEY_FROM)
		.setDataType(PropertyConfig.DATA_TYPE_STRING)
		.setCardinality(PropertyConfig.CARDINALITY_OPTIONAL)
		.setTokenizerType(PropertyConfig.TOKENIZER_TYPE_PLAIN)
		.setIndexingType(PropertyConfig.INDEXING_TYPE_PREFIXES)
		.build()

		).addProperty(new PropertyConfig.Builder(KEY_TO)
		.build())
		.addProperty(
		new PropertyConfig.Builder(KEY_TO)
		.setDataType(PropertyConfig.DATA_TYPE_STRING)
		.setCardinality(PropertyConfig.CARDINALITY_REPEATED)
		.setTokenizerType(PropertyConfig.TOKENIZER_TYPE_PLAIN)
		.setIndexingType(PropertyConfig.INDEXING_TYPE_PREFIXES)
		.build()

		).addProperty(new PropertyConfig.Builder(KEY_CC)
		.build())
		.addProperty(
		new PropertyConfig.Builder(KEY_CC)
		.setDataType(PropertyConfig.DATA_TYPE_STRING)
		.setCardinality(PropertyConfig.CARDINALITY_REPEATED)
		.setTokenizerType(PropertyConfig.TOKENIZER_TYPE_PLAIN)
		.setIndexingType(PropertyConfig.INDEXING_TYPE_PREFIXES)
		.build()

		).addProperty(new PropertyConfig.Builder(KEY_BCC)
		.build())
		.addProperty(
		new PropertyConfig.Builder(KEY_BCC)
		.setDataType(PropertyConfig.DATA_TYPE_STRING)
		.setCardinality(PropertyConfig.CARDINALITY_REPEATED)
		.setTokenizerType(PropertyConfig.TOKENIZER_TYPE_PLAIN)
		.setIndexingType(PropertyConfig.INDEXING_TYPE_PREFIXES)
		.build()

		).addProperty(new PropertyConfig.Builder(KEY_SUBJECT)
		.build())
		.addProperty(
		new PropertyConfig.Builder(KEY_SUBJECT)
		.setDataType(PropertyConfig.DATA_TYPE_STRING)
		.setCardinality(PropertyConfig.CARDINALITY_OPTIONAL)
		.setTokenizerType(PropertyConfig.TOKENIZER_TYPE_PLAIN)
		.setIndexingType(PropertyConfig.INDEXING_TYPE_PREFIXES)
		.build()

		).addProperty(new PropertyConfig.Builder(KEY_BODY)
		.build())
		.addProperty(
		new PropertyConfig.Builder(KEY_BODY)
		.setDataType(PropertyConfig.DATA_TYPE_STRING)
		.setCardinality(PropertyConfig.CARDINALITY_OPTIONAL)
		.setTokenizerType(PropertyConfig.TOKENIZER_TYPE_PLAIN)
		.setIndexingType(PropertyConfig.INDEXING_TYPE_PREFIXES)
		.build()

		).build();
		.build())
		.build();

		/**
		* Creates a new {@link AppSearchEmail} from the contents of an existing
		* {@link GenericDocument}.
		* Creates a new {@link AppSearchEmail} from the contents of an existing {@link
		* GenericDocument}.
		*
		* @param document The {@link GenericDocument} containing the email content.
		*/
		@@ -109,8 +107,8 @@ public class AppSearchEmail extends GenericDocument {
		/**
		* Gets the destination addresses of {@link AppSearchEmail}.
		*
		* @return The destination addresses of {@link AppSearchEmail} or {@code null} if it's not
		* been set yet.
		* @return The destination addresses of {@link AppSearchEmail} or {@code null} if it's not been
		* set yet.
		*/
		@Nullable
		public String[] getTo() {
		@@ -157,9 +155,7 @@ public class AppSearchEmail extends GenericDocument {
		return getPropertyString(KEY_BODY);
		}

		/**
		* The builder class for {@link AppSearchEmail}.
		*/
		/** The builder class for {@link AppSearchEmail}. */
		public static class Builder extends GenericDocument.Builder<AppSearchEmail.Builder> {

		/**
		@@ -171,54 +167,42 @@ public class AppSearchEmail extends GenericDocument {
		super(uri, SCHEMA_TYPE);
		}

		/**
		* Sets the from address of {@link AppSearchEmail}
		*/
		/** Sets the from address of {@link AppSearchEmail} */
		@NonNull
		public AppSearchEmail.Builder setFrom(@NonNull String from) {
		setPropertyString(KEY_FROM, from);
		return this;
		}

		/**
		* Sets the destination address of {@link AppSearchEmail}
		*/
		/** Sets the destination address of {@link AppSearchEmail} */
		@NonNull
		public AppSearchEmail.Builder setTo(@NonNull String... to) {
		setPropertyString(KEY_TO, to);
		return this;
		}

		/**
		* Sets the CC list of {@link AppSearchEmail}
		*/
		/** Sets the CC list of {@link AppSearchEmail} */
		@NonNull
		public AppSearchEmail.Builder setCc(@NonNull String... cc) {
		setPropertyString(KEY_CC, cc);
		return this;
		}

		/**
		* Sets the BCC list of {@link AppSearchEmail}
		*/
		/** Sets the BCC list of {@link AppSearchEmail} */
		@NonNull
		public AppSearchEmail.Builder setBcc(@NonNull String... bcc) {
		setPropertyString(KEY_BCC, bcc);
		return this;
		}

		/**
		* Sets the subject of {@link AppSearchEmail}
		*/
		/** Sets the subject of {@link AppSearchEmail} */
		@NonNull
		public AppSearchEmail.Builder setSubject(@NonNull String subject) {
		setPropertyString(KEY_SUBJECT, subject);
		return this;
		}

		/**
		* Sets the body of {@link AppSearchEmail}
		*/
		/** Sets the body of {@link AppSearchEmail} */
		@NonNull
		public AppSearchEmail.Builder setBody(@NonNull String body) {
		setPropertyString(KEY_BODY, body);

apex/appsearch/framework/java/android/app/appsearch/AppSearchSchema.java

+51 −45

Original line number	Diff line number	Diff line
		@@ -16,15 +16,14 @@

		package android.app.appsearch;

		import android.annotation.SuppressLint;
		import android.os.Bundle;

		import android.annotation.IntDef;
		import android.annotation.NonNull;
		import android.annotation.Nullable;

		import android.annotation.SuppressLint;
		import android.app.appsearch.exceptions.IllegalSchemaException;
		import android.os.Bundle;
		import android.util.ArraySet;

		import com.android.internal.util.Preconditions;

		import java.lang.annotation.Retention;
		@@ -51,7 +50,6 @@ public final class AppSearchSchema {
		private final Bundle mBundle;

		/** @hide */

		public AppSearchSchema(@NonNull Bundle bundle) {
		Preconditions.checkNotNull(bundle);
		mBundle = bundle;
		@@ -59,9 +57,9 @@ public final class AppSearchSchema {

		/**
		* Returns the {@link Bundle} populated by this builder.
		*
		* @hide
		*/

		@NonNull
		public Bundle getBundle() {
		return mBundle;
		@@ -146,8 +144,8 @@ public final class AppSearchSchema {
		/**
		* Configuration for a single property (field) of a document type.
		*
		* <p>For example, an {@code EmailMessage} would be a type and the {@code subject} would be
		* a property.
		* <p>For example, an {@code EmailMessage} would be a type and the {@code subject} would be a
		* property.
		*/
		public static final class PropertyConfig {
		private static final String NAME_FIELD = "name";
		@@ -159,11 +157,13 @@ public final class AppSearchSchema {

		/**
		* Physical data-types of the contents of the property.
		*
		* @hide
		*/
		// NOTE: The integer values of these constants must match the proto enum constants in
		// com.google.android.icing.proto.PropertyConfigProto.DataType.Code.
		@IntDef(value = {
		@IntDef(
		value = {
		DATA_TYPE_STRING,
		DATA_TYPE_INT64,
		DATA_TYPE_DOUBLE,
		@@ -183,19 +183,20 @@ public final class AppSearchSchema {
		public static final int DATA_TYPE_BYTES = 5;

		/**
		* Indicates that the property itself is an Document, making it part a hierarchical
		* Document schema. Any property using this DataType MUST have a valid
		* {@code schemaType}.
		* Indicates that the property itself is an Document, making it part a hierarchical Document
		* schema. Any property using this DataType MUST have a valid {@code schemaType}.
		*/
		public static final int DATA_TYPE_DOCUMENT = 6;

		/**
		* The cardinality of the property (whether it is required, optional or repeated).
		*
		* @hide
		*/
		// NOTE: The integer values of these constants must match the proto enum constants in
		// com.google.android.icing.proto.PropertyConfigProto.Cardinality.Code.
		@IntDef(value = {
		@IntDef(
		value = {
		CARDINALITY_REPEATED,
		CARDINALITY_OPTIONAL,
		CARDINALITY_REQUIRED,
		@@ -214,9 +215,11 @@ public final class AppSearchSchema {

		/**
		* Encapsulates the configurations on how AppSearch should query/index these terms.
		*
		* @hide
		*/
		@IntDef(value = {
		@IntDef(
		value = {
		INDEXING_TYPE_NONE,
		INDEXING_TYPE_EXACT_TERMS,
		INDEXING_TYPE_PREFIXES,
		@@ -227,10 +230,10 @@ public final class AppSearchSchema {
		/**
		* Content in this property will not be tokenized or indexed.
		*
		* <p>Useful if the data type is not made up of terms (e.g.
		* {@link PropertyConfig#DATA_TYPE_DOCUMENT} or {@link PropertyConfig#DATA_TYPE_BYTES}
		* type). All the properties inside the nested property won't be indexed regardless of the
		* value of {@code indexingType} for the nested properties.
		* <p>Useful if the data type is not made up of terms (e.g. {@link
		* PropertyConfig#DATA_TYPE_DOCUMENT} or {@link PropertyConfig#DATA_TYPE_BYTES} type). All
		* the properties inside the nested property won't be indexed regardless of the value of
		* {@code indexingType} for the nested properties.
		*/
		public static final int INDEXING_TYPE_NONE = 0;

		@@ -252,11 +255,13 @@ public final class AppSearchSchema {

		/**
		* Configures how tokens should be extracted from this property.
		*
		* @hide
		*/
		// NOTE: The integer values of these constants must match the proto enum constants in
		// com.google.android.icing.proto.IndexingConfig.TokenizerType.Code.
		@IntDef(value = {
		@IntDef(
		value = {
		TOKENIZER_TYPE_NONE,
		TOKENIZER_TYPE_PLAIN,
		})
		@@ -264,8 +269,8 @@ public final class AppSearchSchema {
		public @interface TokenizerType {}

		/**
		* It is only valid for tokenizer_type to be 'NONE' if the data type is
		* {@link PropertyConfig#DATA_TYPE_DOCUMENT}.
		* It is only valid for tokenizer_type to be 'NONE' if the data type is {@link
		* PropertyConfig#DATA_TYPE_DOCUMENT}.
		*/
		public static final int TOKENIZER_TYPE_NONE = 0;

		@@ -297,8 +302,8 @@ public final class AppSearchSchema {
		/**
		* Returns the logical schema-type of the contents of this property.
		*
		* <p>Only set when {@link #getDataType} is set to {@link #DATA_TYPE_DOCUMENT}.
		* Otherwise, it is {@code null}.
		* <p>Only set when {@link #getDataType} is set to {@link #DATA_TYPE_DOCUMENT}. Otherwise,
		* it is {@code null}.
		*/
		@Nullable
		public String getSchemaType() {
		@@ -327,6 +332,7 @@ public final class AppSearchSchema {
		*
		* <p>The following properties must be set, or {@link PropertyConfig} construction will
		* fail:
		*
		* <ul>
		* <li>dataType
		* <li>cardinality
		@@ -361,8 +367,8 @@ public final class AppSearchSchema {
		/**
		* The logical schema-type of the contents of this property.
		*
		* <p>Only required when {@link #setDataType} is set to
		* {@link #DATA_TYPE_DOCUMENT}. Otherwise, it is ignored.
		* <p>Only required when {@link #setDataType} is set to {@link #DATA_TYPE_DOCUMENT}.
		* Otherwise, it is ignored.
		*/
		@NonNull
		public PropertyConfig.Builder setSchemaType(@NonNull String schemaType) {

apex/appsearch/framework/java/android/app/appsearch/GenericDocument.java

+97 −86

File changed.

Preview size limit exceeded, changes collapsed.

apex/appsearch/framework/java/android/app/appsearch/GetByUriRequest.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ package android.app.appsearch;

		import android.annotation.NonNull;
		import android.util.ArraySet;

		import com.android.internal.util.Preconditions;

		import java.util.Arrays;

apex/appsearch/framework/java/android/app/appsearch/PutDocumentsRequest.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -16,10 +16,10 @@

		package android.app.appsearch;

		import android.annotation.SuppressLint;

		import android.annotation.NonNull;
		import android.annotation.SuppressLint;
		import android.app.appsearch.exceptions.AppSearchException;

		import com.android.internal.util.Preconditions;

		import java.util.ArrayList;