commit 4f2db8546030c13ab541d9d0af42983a94c33817
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Aug 27 22:59:17 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 27 22:59:17 2024 +0000
tree e1baced689ef484912329ab527bd4a133e893fb4
parent 0fe8e75a170d2cfb1fd4c91837eb883cd234b505
parent 0c940236eab0f7d33d235c2e4d9ce116a0744d01

Merge "Initialize ProtoLog in SystemServer process" into main

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

diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index da3ada8..c5c371f 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -106,7 +106,9 @@
 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 @@
             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");