Merge "Cast null to Object to avoid ambiguity" into main (78297ef2) · Commits · e / os / android_frameworks_base

tests/Internal/src/com/android/internal/protolog/PerfettoProtoLogImplTest.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -698,7 +698,7 @@ public class PerfettoProtoLogImplTest {
		traceMonitor.start();

		mProtoLog.log(LogLevel.DEBUG, TestProtoLogGroup.TEST_GROUP,
		"My test null string: %s", null);
		"My test null string: %s", (Object) null);
		} finally {
		traceMonitor.stop(mWriter);
		}