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

Commit 55619a00 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
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 am: c31d0bea am: 5af6b8c6

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



Change-Id: I80cadf53e4bb228f2f3d97134831f7fe9551dbbc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 61feefd4 5af6b8c6

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

+10 −0
Original line number Diff line number Diff line
@@ -127,6 +127,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;
@@ -1413,6 +1414,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

    }