Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50f38e6a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Use AppSearchModule$Lifecycle class for starting system services in... 

Merge "Use AppSearchModule$Lifecycle class for starting system services in appsearch" into tm-dev am: 51efba8f

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16942654

Change-Id: Ic7b0aac82c86436898314ab584c68f2e8fd466c8
parents eb90632c 51efba8f

services/java/com/android/server/SystemServer.java

+4 −4
Original line number Diff line number Diff line
@@ -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)) {