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

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

Merge "Start CpuMonitorService as part of the core services startup on... 

Merge "Start CpuMonitorService as part of the core services startup on debuggable builds." into udc-dev
parents 6c804f12 9891861a

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

+10 −0
Original line number Diff line number Diff line
@@ -125,6 +125,7 @@ import com.android.server.compat.PlatformCompatNative; 
import com.android.server.connectivity.PacProxyService;

import com.android.server.contentcapture.ContentCaptureManagerInternal;

import com.android.server.coverage.CoverageService;

import com.android.server.cpu.CpuMonitorService;

import com.android.server.devicepolicy.DevicePolicyManagerService;

import com.android.server.devicestate.DeviceStateManagerService;

import com.android.server.display.DisplayManagerService;
@@ -1405,6 +1406,15 @@ public final class SystemServer implements Dumpable { 
        mSystemServiceManager.startService(RemoteProvisioningService.class);

        t.traceEnd();



        // TODO(b/277600174): Start CpuMonitorService on all builds and not just on debuggable

        // builds once the Android JobScheduler starts using this service.

        if (Build.IS_DEBUGGABLE || Build.IS_ENG) {

          // Service for CPU monitor.

          t.traceBegin("CpuMonitorService");

          mSystemServiceManager.startService(CpuMonitorService.class);

          t.traceEnd();

        }



        t.traceEnd(); // startCoreServices

    }