Merge "Update Framework from Jetpack." into sc-dev (db7aecbc) · Commits · e / os / android_frameworks_base

apex/appsearch/framework/api/current.txt

+4 −4

Original line number	Diff line number	Diff line
		@@ -207,7 +207,6 @@ package android.app.appsearch {

		public static final class GetByUriRequest.Builder {
		ctor public GetByUriRequest.Builder();
		method @NonNull public android.app.appsearch.GetByUriRequest.Builder addProjection(@NonNull String, @NonNull java.lang.String...);
		method @NonNull public android.app.appsearch.GetByUriRequest.Builder addProjection(@NonNull String, @NonNull java.util.Collection<java.lang.String>);
		method @NonNull public android.app.appsearch.GetByUriRequest.Builder addUris(@NonNull java.lang.String...);
		method @NonNull public android.app.appsearch.GetByUriRequest.Builder addUris(@NonNull java.util.Collection<java.lang.String>);
		@@ -323,7 +322,6 @@ package android.app.appsearch {
		method @NonNull public android.app.appsearch.SearchSpec.Builder addFilterPackageNames(@NonNull java.util.Collection<java.lang.String>);
		method @NonNull public android.app.appsearch.SearchSpec.Builder addFilterSchemas(@NonNull java.lang.String...);
		method @NonNull public android.app.appsearch.SearchSpec.Builder addFilterSchemas(@NonNull java.util.Collection<java.lang.String>);
		method @NonNull public android.app.appsearch.SearchSpec.Builder addProjection(@NonNull String, @NonNull java.lang.String...);
		method @NonNull public android.app.appsearch.SearchSpec.Builder addProjection(@NonNull String, @NonNull java.util.Collection<java.lang.String>);
		method @NonNull public android.app.appsearch.SearchSpec build();
		method @NonNull public android.app.appsearch.SearchSpec.Builder setMaxSnippetSize(@IntRange(from=0, to=android.app.appsearch.SearchSpec.MAX_SNIPPET_SIZE_LIMIT) int);
		@@ -338,7 +336,8 @@ package android.app.appsearch {
		public final class SetSchemaRequest {
		method @NonNull public java.util.Map<java.lang.String,android.app.appsearch.AppSearchSchema.Migrator> getMigrators();
		method @NonNull public java.util.Set<android.app.appsearch.AppSearchSchema> getSchemas();
		method @NonNull public java.util.Set<java.lang.String> getSchemasNotVisibleToSystemUi();
		method @NonNull public java.util.Set<java.lang.String> getSchemasNotDisplayedBySystem();
		method @Deprecated @NonNull public java.util.Set<java.lang.String> getSchemasNotVisibleToSystemUi();
		method @NonNull public java.util.Map<java.lang.String,java.util.Set<android.app.appsearch.PackageIdentifier>> getSchemasVisibleToPackages();
		method public boolean isForceOverride();
		}
		@@ -350,8 +349,9 @@ package android.app.appsearch {
		method @NonNull public android.app.appsearch.SetSchemaRequest build();
		method @NonNull public android.app.appsearch.SetSchemaRequest.Builder setForceOverride(boolean);
		method @NonNull public android.app.appsearch.SetSchemaRequest.Builder setMigrator(@NonNull String, @NonNull android.app.appsearch.AppSearchSchema.Migrator);
		method @NonNull public android.app.appsearch.SetSchemaRequest.Builder setSchemaTypeDisplayedBySystem(@NonNull String, boolean);
		method @NonNull public android.app.appsearch.SetSchemaRequest.Builder setSchemaTypeVisibilityForPackage(@NonNull String, boolean, @NonNull android.app.appsearch.PackageIdentifier);
		method @NonNull public android.app.appsearch.SetSchemaRequest.Builder setSchemaTypeVisibilityForSystemUi(@NonNull String, boolean);
		method @Deprecated @NonNull public android.app.appsearch.SetSchemaRequest.Builder setSchemaTypeVisibilityForSystemUi(@NonNull String, boolean);
		}

		public class SetSchemaResponse {

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -317,7 +317,7 @@ public class AppSearchManager {
		getPackageName(),
		DEFAULT_DATABASE_NAME,
		schemaBundles,
		new ArrayList<>(request.getSchemasNotVisibleToSystemUi()),
		new ArrayList<>(request.getSchemasNotDisplayedBySystem()),
		/schemasPackageAccessible=/ Collections.emptyMap(),
		request.isForceOverride(),
		mContext.getUserId(),

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -146,7 +146,7 @@ public final class AppSearchSession implements Closeable {
		mPackageName,
		mDatabaseName,
		schemaBundles,
		new ArrayList<>(request.getSchemasNotVisibleToSystemUi()),
		new ArrayList<>(request.getSchemasNotDisplayedBySystem()),
		schemasPackageAccessibleBundles,
		request.isForceOverride(),
		mUserId,

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -96,7 +96,7 @@ public class GlobalSearchSession implements Closeable {
		* SetSchemaRequest.Builder#setSchemaTypeVisibilityForPackage} when building a schema.
		*
		* <p>Document access can also be granted to system UIs by specifying {@link
		* SetSchemaRequest.Builder#setSchemaTypeVisibilityForSystemUi} when building a schema.
		* SetSchemaRequest.Builder#setSchemaTypeDisplayedBySystem} when building a schema.
		*
		* <p>See {@link AppSearchSession#search} for a detailed explanation on forming a query string.
		*

apex/appsearch/framework/java/android/app/appsearch/IAppSearchManager.aidl

+2 −2

Original line number	Diff line number	Diff line
		@@ -33,7 +33,7 @@ interface IAppSearchManager {
		* @param packageName The name of the package that owns this schema.
		* @param databaseName The name of the database where this schema lives.
		* @param schemaBundles List of {@link AppSearchSchema} bundles.
		* @param schemasNotPlatformSurfaceable Schema types that should not be surfaced on platform
		* @param schemasNotDisplayedBySystem Schema types that should not be surfaced on platform
		* surfaces.
		* @param schemasPackageAccessibleBundles Schema types that are visible to the specified
		* packages. The value List contains PackageIdentifier Bundles.
		@@ -47,7 +47,7 @@ interface IAppSearchManager {
		in String packageName,
		in String databaseName,
		in List<Bundle> schemaBundles,
		in List<String> schemasNotPlatformSurfaceable,
		in List<String> schemasNotDisplayedBySystem,
		in Map<String, List<Bundle>> schemasPackageAccessibleBundles,
		boolean forceOverride,
		in int userId,