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

Commit ebf8e0c8 authored by Pablo Gamito's avatar Pablo Gamito Committed by Android (Google) Code Review
Browse files

Merge "Register ProtoLog service" into main

parents b97bb884 2fd4e623

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

+8 −0
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@ import com.android.internal.notification.SystemNotificationChannels; 
import com.android.internal.os.BinderInternal;

import com.android.internal.os.RuntimeInit;

import com.android.internal.policy.AttributeCache;

import com.android.internal.protolog.ProtoLogService;

import com.android.internal.util.ConcurrentUtils;

import com.android.internal.util.EmergencyAffordanceManager;

import com.android.internal.util.FrameworkStatsLog;
@@ -1087,6 +1088,13 @@ public final class SystemServer implements Dumpable { 
        SystemServerInitThreadPool.submit(SystemConfig::getInstance, TAG_SYSTEM_CONFIG);

        t.traceEnd();



        // Orchestrates some ProtoLogging functionality.

        if (android.tracing.Flags.clientSideProtoLogging()) {

            t.traceBegin("StartProtoLogService");

            ServiceManager.addService(Context.PROTOLOG_SERVICE, new ProtoLogService());

            t.traceEnd();

        }



        // Platform compat service is used by ActivityManagerService, PackageManagerService, and

        // possibly others in the future. b/135010838.

        t.traceBegin("PlatformCompat");