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

Commit 5af6b8c6 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

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



Change-Id: I9282c34ac96577e0158711b3c677065ad2f44ac9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 97eca72d c31d0bea

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

    }