Merge "Update framework from jetpack." into sc-dev am: 9f9cc640df (9dd11541) · Commits · e / os / android_frameworks_base

apex/appsearch/framework/api/current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -206,7 +206,7 @@ package android.app.appsearch {
		method @NonNull public android.app.appsearch.GetByDocumentIdRequest build();
		}

		public class GetSchemaResponse {
		public final class GetSchemaResponse {
		method @NonNull public java.util.Set<android.app.appsearch.AppSearchSchema> getSchemas();
		method @IntRange(from=0) public int getVersion();
		}

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

+25 −2

Original line number	Diff line number	Diff line
		@@ -389,12 +389,24 @@ public final class AppSearchSchema {
		public @interface TokenizerType {}

		/**
		* It is only valid for tokenizer_type to be 'NONE' if {@link #getIndexingType} is {@link
		* This value indicates that no tokens should be extracted from this property.
		*
		* <p>It is only valid for tokenizer_type to be 'NONE' if {@link #getIndexingType} is {@link
		* #INDEXING_TYPE_NONE}.
		*/
		public static final int TOKENIZER_TYPE_NONE = 0;

		/** Tokenization for plain text. */
		/**
		* Tokenization for plain text. This value indicates that tokens should be extracted from
		* this property based on word breaks. Segments of whitespace and punctuation are not
		* considered tokens.
		*
		* <p>Ex. A property with "foo bar. baz." will produce tokens for "foo", "bar" and "baz".
		* The segments " " and "." will not be considered tokens.
		*
		* <p>It is only valid for tokenizer_type to be 'PLAIN' if {@link #getIndexingType} is
		* {@link #INDEXING_TYPE_EXACT_TERMS} or {@link #INDEXING_TYPE_PREFIXES}.
		*/
		public static final int TOKENIZER_TYPE_PLAIN = 1;

		StringPropertyConfig(@NonNull Bundle bundle) {
		@@ -474,6 +486,17 @@ public final class AppSearchSchema {
		/** Constructs a new {@link StringPropertyConfig} from the contents of this builder. */
		@NonNull
		public StringPropertyConfig build() {
		if (mTokenizerType == TOKENIZER_TYPE_NONE) {
		Preconditions.checkState(
		mIndexingType == INDEXING_TYPE_NONE,
		"Cannot set "
		+ "TOKENIZER_TYPE_NONE with an indexing type other than "
		+ "INDEXING_TYPE_NONE.");
		} else {
		Preconditions.checkState(
		mIndexingType != INDEXING_TYPE_NONE,
		"Cannot set " + "TOKENIZER_TYPE_PLAIN with INDEXING_TYPE_NONE.");
		}
		Bundle bundle = new Bundle();
		bundle.putString(NAME_FIELD, mPropertyName);
		bundle.putInt(DATA_TYPE_FIELD, DATA_TYPE_STRING);

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

+37 −42

Original line number	Diff line number	Diff line
		@@ -27,8 +27,6 @@ import android.os.Bundle;
		import android.os.Parcelable;
		import android.util.Log;

		import com.android.internal.util.Preconditions;

		import java.lang.reflect.Array;
		import java.util.ArrayList;
		import java.util.Arrays;
		@@ -1018,17 +1016,14 @@ public class GenericDocument {
		// GenericDocument.
		@SuppressLint("StaticFinalBuilder")
		public static class Builder<BuilderType extends Builder> {

		private final Bundle mBundle;
		private final Bundle mProperties;
		private Bundle mBundle;
		private Bundle mProperties;
		private final BuilderType mBuilderTypeInstance;
		private boolean mBuilt = false;

		/**
		* Creates a new {@link GenericDocument.Builder}.
		*
		* <p>Once {@link #build} is called, the instance can no longer be used.
		*
		* <p>Document IDs are unique within a namespace.
		*
		* <p>The number of namespaces per app should be kept small for efficiency reasons.
		@@ -1053,9 +1048,6 @@ public class GenericDocument {
		mBundle.putString(GenericDocument.NAMESPACE_FIELD, namespace);
		mBundle.putString(GenericDocument.ID_FIELD, id);
		mBundle.putString(GenericDocument.SCHEMA_TYPE_FIELD, schemaType);
		// Set current timestamp for creation timestamp by default.
		mBundle.putLong(
		GenericDocument.CREATION_TIMESTAMP_MILLIS_FIELD, System.currentTimeMillis());
		mBundle.putLong(GenericDocument.TTL_MILLIS_FIELD, DEFAULT_TTL_MILLIS);
		mBundle.putInt(GenericDocument.SCORE_FIELD, DEFAULT_SCORE);

		@@ -1063,7 +1055,11 @@ public class GenericDocument {
		mBundle.putBundle(PROPERTIES_FIELD, mProperties);
		}

		/** Creates a new {@link GenericDocument.Builder} from the given Bundle. */
		/**
		* Creates a new {@link GenericDocument.Builder} from the given Bundle.
		*
		* <p>The bundle is NOT copied.
		*/
		@SuppressWarnings("unchecked")
		Builder(@NonNull Bundle bundle) {
		mBundle = Objects.requireNonNull(bundle);
		@@ -1079,13 +1075,12 @@ public class GenericDocument {
		*
		* <p>The number of namespaces per app should be kept small for efficiency reasons.
		*
		* @throws IllegalStateException if the builder has already been used.
		* @hide
		*/
		@NonNull
		public BuilderType setNamespace(@NonNull String namespace) {
		Preconditions.checkState(!mBuilt, "Builder has already been used");
		Objects.requireNonNull(namespace);
		resetIfBuilt();
		mBundle.putString(GenericDocument.NAMESPACE_FIELD, namespace);
		return mBuilderTypeInstance;
		}
		@@ -1096,13 +1091,12 @@ public class GenericDocument {
		*
		* <p>Document IDs are unique within a namespace.
		*
		* @throws IllegalStateException if the builder has already been used.
		* @hide
		*/
		@NonNull
		public BuilderType setId(@NonNull String id) {
		Preconditions.checkState(!mBuilt, "Builder has already been used");
		Objects.requireNonNull(id);
		resetIfBuilt();
		mBundle.putString(GenericDocument.ID_FIELD, id);
		return mBuilderTypeInstance;
		}
		@@ -1113,13 +1107,12 @@ public class GenericDocument {
		* <p>To successfully index a document, the schema type must match the name of an {@link
		* AppSearchSchema} object previously provided to {@link AppSearchSession#setSchema}.
		*
		* @throws IllegalStateException if the builder has already been used.
		* @hide
		*/
		@NonNull
		public BuilderType setSchemaType(@NonNull String schemaType) {
		Preconditions.checkState(!mBuilt, "Builder has already been used");
		Objects.requireNonNull(schemaType);
		resetIfBuilt();
		mBundle.putString(GenericDocument.SCHEMA_TYPE_FIELD, schemaType);
		return mBuilderTypeInstance;
		}
		@@ -1136,14 +1129,13 @@ public class GenericDocument {
		* <p>Any non-negative integer can be used a score. By default, scores are set to 0.
		*
		* @param score any non-negative {@code int} representing the document's score.
		* @throws IllegalStateException if the builder has already been used.
		*/
		@NonNull
		public BuilderType setScore(@IntRange(from = 0, to = Integer.MAX_VALUE) int score) {
		Preconditions.checkState(!mBuilt, "Builder has already been used");
		if (score < 0) {
		throw new IllegalArgumentException("Document score cannot be negative.");
		}
		resetIfBuilt();
		mBundle.putInt(GenericDocument.SCORE_FIELD, score);
		return mBuilderTypeInstance;
		}
		@@ -1154,13 +1146,14 @@ public class GenericDocument {
		* <p>This should be set using a value obtained from the {@link System#currentTimeMillis}
		* time base.
		*
		* <p>If this method is not called, this will be set to the time the object is built.
		*
		* @param creationTimestampMillis a creation timestamp in milliseconds.
		* @throws IllegalStateException if the builder has already been used.
		*/
		@NonNull
		public BuilderType setCreationTimestampMillis(
		@CurrentTimeMillisLong long creationTimestampMillis) {
		Preconditions.checkState(!mBuilt, "Builder has already been used");
		resetIfBuilt();
		mBundle.putLong(
		GenericDocument.CREATION_TIMESTAMP_MILLIS_FIELD, creationTimestampMillis);
		return mBuilderTypeInstance;
		@@ -1177,14 +1170,13 @@ public class GenericDocument {
		* auto-deleted until the app is uninstalled or {@link AppSearchSession#remove} is called.
		*
		* @param ttlMillis a non-negative duration in milliseconds.
		* @throws IllegalStateException if the builder has already been used.
		*/
		@NonNull
		public BuilderType setTtlMillis(long ttlMillis) {
		Preconditions.checkState(!mBuilt, "Builder has already been used");
		if (ttlMillis < 0) {
		throw new IllegalArgumentException("Document ttlMillis cannot be negative.");
		}
		resetIfBuilt();
		mBundle.putLong(GenericDocument.TTL_MILLIS_FIELD, ttlMillis);
		return mBuilderTypeInstance;
		}
		@@ -1197,13 +1189,12 @@ public class GenericDocument {
		* @param values the {@code String} values of the property.
		* @throws IllegalArgumentException if no values are provided, if provided values exceed
		* maximum repeated property length, or if a passed in {@code String} is {@code null}.
		* @throws IllegalStateException if the builder has already been used.
		*/
		@NonNull
		public BuilderType setPropertyString(@NonNull String name, @NonNull String... values) {
		Preconditions.checkState(!mBuilt, "Builder has already been used");
		Objects.requireNonNull(name);
		Objects.requireNonNull(values);
		resetIfBuilt();
		putInPropertyBundle(name, values);
		return mBuilderTypeInstance;
		}
		@@ -1216,13 +1207,12 @@ public class GenericDocument {
		* property as given in {@link AppSearchSchema.PropertyConfig#getName}.
		* @param values the {@code boolean} values of the property.
		* @throws IllegalArgumentException if values exceed maximum repeated property length.
		* @throws IllegalStateException if the builder has already been used.
		*/
		@NonNull
		public BuilderType setPropertyBoolean(@NonNull String name, @NonNull boolean... values) {
		Preconditions.checkState(!mBuilt, "Builder has already been used");
		Objects.requireNonNull(name);
		Objects.requireNonNull(values);
		resetIfBuilt();
		putInPropertyBundle(name, values);
		return mBuilderTypeInstance;
		}
		@@ -1234,13 +1224,12 @@ public class GenericDocument {
		* property as given in {@link AppSearchSchema.PropertyConfig#getName}.
		* @param values the {@code long} values of the property.
		* @throws IllegalArgumentException if values exceed maximum repeated property length.
		* @throws IllegalStateException if the builder has already been used.
		*/
		@NonNull
		public BuilderType setPropertyLong(@NonNull String name, @NonNull long... values) {
		Preconditions.checkState(!mBuilt, "Builder has already been used");
		Objects.requireNonNull(name);
		Objects.requireNonNull(values);
		resetIfBuilt();
		putInPropertyBundle(name, values);
		return mBuilderTypeInstance;
		}
		@@ -1252,13 +1241,12 @@ public class GenericDocument {
		* property as given in {@link AppSearchSchema.PropertyConfig#getName}.
		* @param values the {@code double} values of the property.
		* @throws IllegalArgumentException if values exceed maximum repeated property length.
		* @throws IllegalStateException if the builder has already been used.
		*/
		@NonNull
		public BuilderType setPropertyDouble(@NonNull String name, @NonNull double... values) {
		Preconditions.checkState(!mBuilt, "Builder has already been used");
		Objects.requireNonNull(name);
		Objects.requireNonNull(values);
		resetIfBuilt();
		putInPropertyBundle(name, values);
		return mBuilderTypeInstance;
		}
		@@ -1271,13 +1259,12 @@ public class GenericDocument {
		* @param values the {@code byte[]} of the property.
		* @throws IllegalArgumentException if no values are provided, if provided values exceed
		* maximum repeated property length, or if a passed in {@code byte[]} is {@code null}.
		* @throws IllegalStateException if the builder has already been used.
		*/
		@NonNull
		public BuilderType setPropertyBytes(@NonNull String name, @NonNull byte[]... values) {
		Preconditions.checkState(!mBuilt, "Builder has already been used");
		Objects.requireNonNull(name);
		Objects.requireNonNull(values);
		resetIfBuilt();
		putInPropertyBundle(name, values);
		return mBuilderTypeInstance;
		}
		@@ -1292,14 +1279,13 @@ public class GenericDocument {
		* @throws IllegalArgumentException if no values are provided, if provided values exceed if
		* provided values exceed maximum repeated property length, or if a passed in {@link
		* GenericDocument} is {@code null}.
		* @throws IllegalStateException if the builder has already been used.
		*/
		@NonNull
		public BuilderType setPropertyDocument(
		@NonNull String name, @NonNull GenericDocument... values) {
		Preconditions.checkState(!mBuilt, "Builder has already been used");
		Objects.requireNonNull(name);
		Objects.requireNonNull(values);
		resetIfBuilt();
		putInPropertyBundle(name, values);
		return mBuilderTypeInstance;
		}
		@@ -1314,8 +1300,8 @@ public class GenericDocument {
		*/
		@NonNull
		public BuilderType clearProperty(@NonNull String name) {
		Preconditions.checkState(!mBuilt, "Builder has already been used");
		Objects.requireNonNull(name);
		resetIfBuilt();
		mProperties.remove(name);
		return mBuilderTypeInstance;
		}
		@@ -1399,16 +1385,25 @@ public class GenericDocument {
		}
		}

		/**
		* Builds the {@link GenericDocument} object.
		*
		* @throws IllegalStateException if the builder has already been used.
		*/
		/** Builds the {@link GenericDocument} object. */
		@NonNull
		public GenericDocument build() {
		Preconditions.checkState(!mBuilt, "Builder has already been used");
		mBuilt = true;
		// Set current timestamp for creation timestamp by default.
		if (mBundle.getLong(GenericDocument.CREATION_TIMESTAMP_MILLIS_FIELD, -1) == -1) {
		mBundle.putLong(
		GenericDocument.CREATION_TIMESTAMP_MILLIS_FIELD,
		System.currentTimeMillis());
		}
		return new GenericDocument(mBundle);
		}

		private void resetIfBuilt() {
		if (mBuilt) {
		mBundle = BundleUtil.deepCopy(mBundle);
		mProperties = mBundle.getBundle(PROPERTIES_FIELD);
		mBuilt = false;
		}
		}
		}
		}

apex/appsearch/framework/java/external/android/app/appsearch/GetSchemaResponse.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -26,7 +26,7 @@ import java.util.Objects;
		import java.util.Set;

		/** The response class of {@link AppSearchSession#getSchema} */
		public class GetSchemaResponse {
		public final class GetSchemaResponse {
		private static final String VERSION_FIELD = "version";
		private static final String SCHEMAS_FIELD = "schemas";

apex/appsearch/framework/java/external/android/app/appsearch/SetSchemaRequest.java

+4 −1

Original line number	Diff line number	Diff line
		@@ -322,6 +322,8 @@ public final class SetSchemaRequest {
		/**
		* Sets a Map of {@link Migrator}s.
		*
		* <p>The key of the map is the schema type that the {@link Migrator} value applies to.
		*
		* <p>The {@link Migrator} migrates all {@link GenericDocument}s under given schema type
		* from the current version number stored in AppSearch to the final version set via {@link
		* #setVersion}.
		@@ -335,7 +337,8 @@ public final class SetSchemaRequest {
		* SetSchemaRequest}.
		*
		* @param migrators A {@link Map} of migrators that translate a document from it's current
		* version to the final version set via {@link #setVersion}.
		* version to the final version set via {@link #setVersion}. The key of the map is the
		* schema type that the {@link Migrator} value applies to.
		* @see SetSchemaRequest.Builder#setVersion
		* @see SetSchemaRequest.Builder#addSchemas
		* @see AppSearchSession#setSchema