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

Commit 035f5fea authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "For now the class would be instantiated in platform itself." into main

parents 5f8c2fb4 ea6e2753

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

+2 −3
Original line number Diff line number Diff line
@@ -153,6 +153,7 @@ import com.android.server.contentsuggestions.ContentSuggestionsManagerService; 
import com.android.server.contextualsearch.ContextualSearchManagerService;

import com.android.server.coverage.CoverageService;

import com.android.server.cpu.CpuMonitorService;

import com.android.server.crashrecovery.CrashRecoveryModule;

import com.android.server.credentials.CredentialManagerService;

import com.android.server.criticalevents.CriticalEventLog;

import com.android.server.devicepolicy.DevicePolicyManagerService;
@@ -381,8 +382,6 @@ public final class SystemServer implements Dumpable { 
                    + "OnDevicePersonalizationSystemService$Lifecycle";

    private static final String UPDATABLE_DEVICE_CONFIG_SERVICE_CLASS =

            "com.android.server.deviceconfig.DeviceConfigInit$Lifecycle";

    private static final String CRASHRECOVERY_MODULE_LIFECYCLE_CLASS =

            "com.android.server.crashrecovery.CrashRecoveryModule$Lifecycle";





    /*
@@ -2939,7 +2938,7 @@ public final class SystemServer implements Dumpable { 


        if (Flags.refactorCrashrecovery()) {

            t.traceBegin("StartCrashRecoveryModule");

            mSystemServiceManager.startService(CRASHRECOVERY_MODULE_LIFECYCLE_CLASS);

            mSystemServiceManager.startService(CrashRecoveryModule.Lifecycle.class);

            t.traceEnd();

        } else {

            if (Flags.recoverabilityDetection()) {