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

Commit 812d479d authored Jul 08, 2024 by Charles Yo

Revert "Use registerGroups API"

Revert submission 28147757-no-processing-protolog

Reason for revert: b/351458758

Reverted changes: /q/submissionid:28147757-no-processing-protolog

Change-Id: I26910436a90f31dce27d204f67ef59f6075f1019

parent a72c380f

core/java/com/android/internal/protolog/ProtoLogImpl.java

+3 −4

Original line number	Diff line number	Diff line
		@@ -105,14 +105,13 @@ public class ProtoLogImpl {
		public static synchronized IProtoLog getSingleInstance() {
		if (sServiceInstance == null) {
		if (android.tracing.Flags.perfettoProtologTracing()) {
		sServiceInstance = new PerfettoProtoLogImpl(sViewerConfigPath, sCacheUpdater);
		sServiceInstance = new PerfettoProtoLogImpl(
		sViewerConfigPath, sLogGroups, sCacheUpdater);
		} else {
		sServiceInstance = new LegacyProtoLogImpl(
		sLegacyOutputFilePath, sLegacyViewerConfigPath, sCacheUpdater);
		sLegacyOutputFilePath, sLegacyViewerConfigPath, sLogGroups, sCacheUpdater);
		}

		IProtoLogGroup[] groups = sLogGroups.values().toArray(new IProtoLogGroup[0]);
		sServiceInstance.registerGroups(groups);
		sCacheUpdater.run();
		}
		return sServiceInstance;

libs/WindowManager/Shell/src/com/android/wm/shell/sysui/ShellInit.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -27,7 +27,6 @@ import androidx.annotation.VisibleForTesting;

		import com.android.internal.protolog.ProtoLog;
		import com.android.wm.shell.common.ShellExecutor;
		import com.android.wm.shell.protolog.ShellProtoLogGroup;

		import java.util.ArrayList;

		@@ -76,7 +75,6 @@ public class ShellInit {
		*/
		@VisibleForTesting
		public void init() {
		ProtoLog.registerGroups(ShellProtoLogGroup.values());
		ProtoLog.v(WM_SHELL_INIT, "Initializing Shell Components: %d", mInitCallbacks.size());
		SurfaceControl.setDebugUsageAfterRelease(true);
		// Init in order of registration