From 9edf5e8d1b425253de8f5caf61d87d1644f23ebf Mon Sep 17 00:00:00 2001 From: Mangesh Ghiware Date: Fri, 18 Feb 2022 19:03:11 +0000 Subject: [PATCH] Use AppSearchModule$Lifecycle class for starting system services in appsearch ag/16942831 creates a new AppSearchModule class that dispatches system service lifecycle callbacks to both AppSearchManagerService and ContactsIndexerManagerService. Test: refactoring CL. Existing unit tests still pass. Change-Id: Ia57732d0ad0c5de86a41b08ec4edafa2dca1ce0e --- services/java/com/android/server/SystemServer.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index e895d377f607f..5098abe4bb553 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -386,8 +386,8 @@ public final class SystemServer implements Dumpable { "com.android.server.DeviceIdleController"; private static final String BLOB_STORE_MANAGER_SERVICE_CLASS = "com.android.server.blob.BlobStoreManagerService"; - private static final String APP_SEARCH_MANAGER_SERVICE_CLASS = - "com.android.server.appsearch.AppSearchManagerService"; + private static final String APPSEARCH_MODULE_LIFECYCLE_CLASS = + "com.android.server.appsearch.AppSearchModule$Lifecycle"; private static final String ISOLATED_COMPILATION_SERVICE_CLASS = "com.android.server.compos.IsolatedCompilationService"; private static final String ROLLBACK_MANAGER_SERVICE_CLASS = @@ -2764,8 +2764,8 @@ public final class SystemServer implements Dumpable { mSystemServiceManager.startService(SAFETY_CENTER_SERVICE_CLASS); t.traceEnd(); - t.traceBegin("AppSearchManagerService"); - mSystemServiceManager.startService(APP_SEARCH_MANAGER_SERVICE_CLASS); + t.traceBegin("AppSearchModule"); + mSystemServiceManager.startService(APPSEARCH_MODULE_LIFECYCLE_CLASS); t.traceEnd(); if (SystemProperties.getBoolean("ro.config.isolated_compilation_enabled", false)) {