Snap for 7321546 from a2bbcf9523220a47a3cd7f5204e525edd2d358c5 to sc-release (eb64f5fb) · Commits · e / os / android_frameworks_base

StubLibraries.bp

+16 −0

Original line number	Diff line number	Diff line
		@@ -482,6 +482,22 @@ java_library_static {
		},
		}

		java_library {
		name: "android_system_server_stubs_current",
		defaults: ["android_stubs_dists_default"],
		srcs: [":services-non-updatable-stubs"],
		installable: false,
		static_libs: [
		"android_module_lib_stubs_current",
		],
		sdk_version: "none",
		system_modules: "none",
		java_version: "1.8",
		dist: {
		dir: "apistubs/android/system-server",
		},
		}

		/////////////////////////////////////////////////////////////////////
		// hwbinder.stubs provides APIs required for building HIDL Java
		// libraries.

+17 −2

Original line number	Diff line number	Diff line
		@@ -96,8 +96,13 @@ public class SetSchemaResponse {
		}

		/**
		* Returns a {@link Set} of schema type that were deleted by the {@link
		* AppSearchSession#setSchema} call.
		* Returns a {@link Set} of deleted schema types.
		*
		* <p>A "deleted" type is a schema type that was previously a part of the database schema but
		* was not present in the {@link SetSchemaRequest} object provided in the
		* {@link AppSearchSession#setSchema) call.
		*
		* <p>Documents for a deleted type are removed from the database.
		*/
		@NonNull
		public Set<String> getDeletedTypes() {
		@@ -113,6 +118,15 @@ public class SetSchemaResponse {
		/**
		* Returns a {@link Set} of schema type that were migrated by the {@link
		* AppSearchSession#setSchema} call.
		*
		* <p>A "migrated" type is a schema type that has triggered a {@link Migrator} instance to
		* migrate documents of the schema type to another schema type, or to another version of the
		* schema type.
		*
		* <p>If a document fails to be migrated, a {@link MigrationFailure} will be generated for that
		* document.
		*
		* @see Migrator
		*/
		@NonNull
		public Set<String> getMigratedTypes() {
		@@ -132,6 +146,7 @@ public class SetSchemaResponse {
		* <p>If a {@link Migrator} is provided for this type and the migration is success triggered.
		* The type will also appear in {@link #getMigratedTypes()}.
		*
		* @see SetSchemaRequest
		* @see AppSearchSession#setSchema
		* @see SetSchemaRequest.Builder#setForceOverride
		*/

+7 −0

Original line number	Diff line number	Diff line
		@@ -42,6 +42,8 @@ public class AppSearchException extends Exception {
		* Initializes an {@link AppSearchException} with a result code and message.
		*
		* @param resultCode One of the constants documented in {@link AppSearchResult#getResultCode}.
		* @param message The detail message (which is saved for later retrieval by the {@link
		* #getMessage()} method).
		*/
		public AppSearchException(
		@AppSearchResult.ResultCode int resultCode, @Nullable String message) {
		@@ -52,6 +54,11 @@ public class AppSearchException extends Exception {
		* Initializes an {@link AppSearchException} with a result code, message and cause.
		*
		* @param resultCode One of the constants documented in {@link AppSearchResult#getResultCode}.
		* @param message The detail message (which is saved for later retrieval by the {@link
		* #getMessage()} method).
		* @param cause The cause (which is saved for later retrieval by the {@link #getCause()}
		* method). (A null value is permitted, and indicates that the cause is nonexistent or
		* unknown.)
		*/
		public AppSearchException(
		@AppSearchResult.ResultCode int resultCode,

+6 −3

Original line number	Diff line number	Diff line
		@@ -501,7 +501,8 @@ public class AppSearchManagerService extends SystemService {
		packageName,
		databaseName,
		queryExpression,
		new SearchSpec(searchSpecBundle));
		new SearchSpec(searchSpecBundle),
		/logger=/ null);
		invokeCallbackOnResult(
		callback,
		AppSearchResult.newSuccessfulResult(searchResultPage.getBundle()));
		@@ -535,7 +536,8 @@ public class AppSearchManagerService extends SystemService {
		queryExpression,
		new SearchSpec(searchSpecBundle),
		packageName,
		callingUid);
		callingUid,
		/logger=/ null);
		invokeCallbackOnResult(
		callback,
		AppSearchResult.newSuccessfulResult(searchResultPage.getBundle()));
		@@ -609,7 +611,8 @@ public class AppSearchManagerService extends SystemService {
		packageName,
		databaseName,
		queryExpression,
		new SearchSpec(searchSpecBundle));
		new SearchSpec(searchSpecBundle),
		/logger=/ null);
		while (!searchResultPage.getResults().isEmpty()) {
		for (int i = 0; i < searchResultPage.getResults().size(); i++) {
		AppSearchMigrationHelper.writeBundleToOutputStream(

+2 −1

Original line number	Diff line number	Diff line
		@@ -149,7 +149,8 @@ public final class ImplInstanceManager {
		private AppSearchImpl createImpl(@NonNull Context context, @UserIdInt int userId)
		throws AppSearchException {
		File appSearchDir = getAppSearchDir(userId);
		return AppSearchImpl.create(appSearchDir, context, userId, mGlobalQuerierPackage);
		return AppSearchImpl.create(
		appSearchDir, context, userId, mGlobalQuerierPackage, /logger=/ null);
		}

		/**