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

Commit de81949f authored by Yi Kong's avatar Yi Kong Committed by Automerger Merge Worker
Browse files

Merge "profcollectd: Only start the forwarding service if enabled through... 

Merge "profcollectd: Only start the forwarding service if enabled through device config" am: fb8f388c am: f69edfbd

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

Change-Id: Ibfb865ebb83200698644644e4afef85a1e44e943
parents cb50c3f6 f69edfbd

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

+1 −1
Original line number Diff line number Diff line
@@ -1226,7 +1226,7 @@ public final class SystemServer { 
            mSystemServiceManager.startService(IorapForwardingService.class);

            t.traceEnd();



            if (Build.IS_DEBUGGABLE) {

            if (Build.IS_DEBUGGABLE && ProfcollectForwardingService.enabled()) {

                t.traceBegin("ProfcollectForwardingService");

                mSystemServiceManager.startService(ProfcollectForwardingService.class);

                t.traceEnd();

services/profcollect/src/com/android/server/profcollect/ProfcollectForwardingService.java

+9 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import android.os.ServiceManager; 
import android.os.SystemProperties;

import android.os.UpdateEngine;

import android.os.UpdateEngineCallback;

import android.provider.DeviceConfig;

import android.util.Log;



import com.android.server.IoThread;
@@ -68,6 +69,14 @@ public final class ProfcollectForwardingService extends SystemService { 
        sSelfService = this;

    }



    /**

     * Check whether profcollect is enabled through device config.

     */

    public static boolean enabled() {

        return DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_PROFCOLLECT_NATIVE_BOOT, "enabled",

            false);

    }



    @Override

    public void onStart() {

        if (DEBUG) {