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

Commit c5c930ae authored Jun 04, 2025 by Pablo Gamito

Fix Ravenwood ProtoLogTest

Flag: TEST_ONLY
Bug: 422422829
Test: atest FrameworksCoreTestsRavenwood:com.android.internal.logging.ProtoLogTest
Change-Id: Icda9001eafc67faf46332748b74838fcca3845be

parent 50252565

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

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -19,6 +19,7 @@ package com.android.internal.protolog;
	import android.annotation.NonNull;		import android.annotation.NonNull;
	import android.annotation.Nullable;		import android.annotation.Nullable;
	import android.os.ServiceManager;		import android.os.ServiceManager;
			import android.ravenwood.annotation.RavenwoodKeepWholeClass;

	import com.android.internal.annotations.GuardedBy;		import com.android.internal.annotations.GuardedBy;
	import com.android.internal.annotations.VisibleForTesting;		import com.android.internal.annotations.VisibleForTesting;
	@@ -35,6 +36,7 @@ import java.util.Set;
	* if shared, but instances are intended to be managed by the ProtoLog class or tests.		* if shared, but instances are intended to be managed by the ProtoLog class or tests.
	* Internal state is synchronized via mInitLock.		* Internal state is synchronized via mInitLock.
	*/		*/
			@RavenwoodKeepWholeClass
	public class ProtoLogController {		public class ProtoLogController {

	@Nullable		@Nullable

core/tests/coretests/src/com/android/internal/logging/ProtoLogTest.java

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -30,7 +30,8 @@ import org.junit.runner.RunWith;
	public class ProtoLogTest {		public class ProtoLogTest {
	@Test		@Test
	public void canTrace() {		public void canTrace() {
	ProtoLog.init(TEST_GROUP_1, TEST_GROUP_2);		ProtoLog.registerLogGroupInProcess(TEST_GROUP_1, TEST_GROUP_2);
			ProtoLog.init();

	ProtoLog.v(TEST_GROUP_1, "Verbose message");		ProtoLog.v(TEST_GROUP_1, "Verbose message");
	ProtoLog.d(TEST_GROUP_1, "Debug message");		ProtoLog.d(TEST_GROUP_1, "Debug message");

ravenwood/texts/ravenwood-annotation-allowed-classes.txt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -584,6 +584,7 @@ com.android.internal.power.ModemPowerProfile

	com.android.internal.protolog.LogcatOnlyProtoLogImpl		com.android.internal.protolog.LogcatOnlyProtoLogImpl
	com.android.internal.protolog.ProtoLog		com.android.internal.protolog.ProtoLog
			com.android.internal.protolog.ProtoLogController

	com.android.internal.protolog.common.LogLevel		com.android.internal.protolog.common.LogLevel