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

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

Merge "Initialize ProtoLog in SystemServer process" into main

parents 0fe8e75a 0c940236

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

+6 −0
Original line number Diff line number Diff line
@@ -106,7 +106,9 @@ 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.ProtoLog;

import com.android.internal.protolog.ProtoLogConfigurationService;

import com.android.internal.protolog.ProtoLogGroup;

import com.android.internal.util.ConcurrentUtils;

import com.android.internal.util.EmergencyAffordanceManager;

import com.android.internal.util.FrameworkStatsLog;
@@ -1099,6 +1101,10 @@ public final class SystemServer implements Dumpable { 
            t.traceEnd();

        }



        t.traceBegin("InitializeProtoLog");

        ProtoLog.init(ProtoLogGroup.values());

        t.traceEnd();



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

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

        t.traceBegin("PlatformCompat");