Merge "Port appsearch-service to the system_server_current sdk." into sc-dev (e665d39f) · Commits · e / os / android_frameworks_base

apex/appsearch/framework/Android.bp

+3 −0

Original line number	Diff line number	Diff line
		@@ -65,5 +65,8 @@ java_sdk_library {
		},
		jarjar_rules: "jarjar-rules.txt",
		apex_available: ["com.android.appsearch"],
		impl_library_visibility: [
		"//frameworks/base/apex/appsearch/service",
		],
		unsafe_ignore_missing_latest_api: true, // TODO(b/146218515) should be removed
		}

apex/appsearch/service/Android.bp

+21 −11

Original line number	Diff line number	Diff line
		@@ -28,31 +28,41 @@ genrule {
		}

		java_library {
		name: "service-appsearch",
		srcs: [
		"java/*/.java",
		":statslog-appsearch-java-gen",
		name: "statslog-appsearch-lib",
		srcs: [":statslog-appsearch-java-gen"],
		libs: [
		"framework-statsd.stubs.module_lib",
		],
		sdk_version: "system_server_current",
		apex_available: ["com.android.appsearch"],
		}

		java_library {
		name: "service-appsearch",
		srcs: ["java/*/.java"],
		sdk_version: "system_server_current",
		static_libs: [
		"icing-java-proto-lite",
		"libicing-java",
		// This list must be kept in sync with jarjar.txt
		"statslog-appsearch-lib",
		// Entries below this line are outside of the appsearch package tree and must be kept in
		// sync with jarjar.txt
		"modules-utils-preconditions",
		],
		libs: [
		"framework",
		"framework-appsearch",
		"framework-statsd.stubs.module_lib",
		"services.core",
		"services.usage",
		"framework-appsearch.impl",
		"unsupportedappusage", // TODO(b/181887768) should be removed
		],
		required: [
		"libicing",
		],
		defaults: ["framework-system-server-module-defaults"],
		permitted_packages: [
		"com.android.server.appsearch",
		"com.google.android.icing",
		],
		jarjar_rules: "jarjar-rules.txt",
		visibility: [
		"//frameworks/base/apex/appsearch:__subpackages__",
		// These are required until appsearch is properly unbundled.
		"//frameworks/base/services/tests/mockingservicestests",
		"//frameworks/base/services/tests/servicestests",

apex/appsearch/service/jarjar-rules.txt

+4 −1

Original line number	Diff line number	Diff line
		# Rename all icing classes to match our module name. OEMs could start using icing lib for some other
		# purpose in system service, which would cause class collisions when loading our apex into the
		# system service.
		rule com.google.protobuf.** com.android.server.appsearch.protobuf.@1
		rule com.google.android.icing.proto.** com.android.server.appsearch.proto.@1
		rule com.google.android.icing.proto.** com.android.server.appsearch.icing.proto.@1

		# Rename all com.android.internal.util classes to prevent class name collisions
		# between this module and the other versions of the utility classes linked into

apex/appsearch/service/java/com/android/server/appsearch/AppSearchManagerService.java

+4 −1

Original line number	Diff line number	Diff line
		@@ -82,7 +82,10 @@ import java.util.concurrent.LinkedBlockingQueue;
		import java.util.concurrent.ThreadPoolExecutor;
		import java.util.concurrent.TimeUnit;

		/** TODO(b/142567528): add comments when implement this class */
		/**
		* The main service implementation which contains AppSearch's platform functionality.
		* @hide
		*/
		public class AppSearchManagerService extends SystemService {
		private static final String TAG = "AppSearchManagerService";
		private final Context mContext;

services/tests/servicestests/src/com/android/server/appsearch/external/localstorage/AppSearchImplTest.java

+13 −13

Original line number	Diff line number	Diff line
		@@ -43,19 +43,19 @@ import androidx.test.core.app.ApplicationProvider;
		import com.android.server.appsearch.external.localstorage.converter.GenericDocumentToProtoConverter;
		import com.android.server.appsearch.external.localstorage.stats.InitializeStats;
		import com.android.server.appsearch.external.localstorage.util.PrefixUtil;
		import com.android.server.appsearch.proto.DocumentProto;
		import com.android.server.appsearch.proto.GetOptimizeInfoResultProto;
		import com.android.server.appsearch.proto.PersistType;
		import com.android.server.appsearch.proto.PropertyConfigProto;
		import com.android.server.appsearch.proto.PropertyProto;
		import com.android.server.appsearch.proto.PutResultProto;
		import com.android.server.appsearch.proto.SchemaProto;
		import com.android.server.appsearch.proto.SchemaTypeConfigProto;
		import com.android.server.appsearch.proto.SearchResultProto;
		import com.android.server.appsearch.proto.SearchSpecProto;
		import com.android.server.appsearch.proto.StatusProto;
		import com.android.server.appsearch.proto.StringIndexingConfig;
		import com.android.server.appsearch.proto.TermMatchType;
		import com.android.server.appsearch.icing.proto.DocumentProto;
		import com.android.server.appsearch.icing.proto.GetOptimizeInfoResultProto;
		import com.android.server.appsearch.icing.proto.PersistType;
		import com.android.server.appsearch.icing.proto.PropertyConfigProto;
		import com.android.server.appsearch.icing.proto.PropertyProto;
		import com.android.server.appsearch.icing.proto.PutResultProto;
		import com.android.server.appsearch.icing.proto.SchemaProto;
		import com.android.server.appsearch.icing.proto.SchemaTypeConfigProto;
		import com.android.server.appsearch.icing.proto.SearchResultProto;
		import com.android.server.appsearch.icing.proto.SearchSpecProto;
		import com.android.server.appsearch.icing.proto.StatusProto;
		import com.android.server.appsearch.icing.proto.StringIndexingConfig;
		import com.android.server.appsearch.icing.proto.TermMatchType;

		import com.google.common.collect.ImmutableList;
		import com.google.common.collect.ImmutableMap;