Loading core/java/com/android/internal/protolog/LegacyProtoLogImpl.java +9 −0 Original line number Diff line number Diff line Loading @@ -48,6 +48,7 @@ import java.io.File; import java.io.IOException; import java.io.PrintWriter; import java.util.ArrayList; import java.util.Arrays; import java.util.Map; import java.util.TreeMap; import java.util.stream.Collectors; Loading Loading @@ -423,6 +424,14 @@ public class LegacyProtoLogImpl implements IProtoLog { for (IProtoLogGroup group : protoLogGroups) { mLogGroups.put(group.name(), group); } final var hasGroupsLoggingToLogcat = Arrays.stream(protoLogGroups) .anyMatch(IProtoLogGroup::isLogToLogcat); final ILogger logger = (msg) -> Slog.i(TAG, msg); if (hasGroupsLoggingToLogcat) { mViewerConfig.loadViewerConfig(logger, mLegacyViewerConfigFilename); } } } tests/Internal/src/com/android/internal/protolog/LegacyProtoLogImplTest.java +7 −0 Original line number Diff line number Diff line Loading @@ -214,6 +214,13 @@ public class LegacyProtoLogImplTest { verify(mReader, never()).getViewerString(anyLong()); } @Test public void loadViewerConfigOnLogcatGroupRegistration() { TestProtoLogGroup.TEST_GROUP.setLogToLogcat(true); mProtoLog.registerGroups(TestProtoLogGroup.TEST_GROUP); verify(mReader).loadViewerConfig(any(), any()); } private static class ProtoLogData { Long mMessageHash = null; Long mElapsedTime = null; Loading Loading
core/java/com/android/internal/protolog/LegacyProtoLogImpl.java +9 −0 Original line number Diff line number Diff line Loading @@ -48,6 +48,7 @@ import java.io.File; import java.io.IOException; import java.io.PrintWriter; import java.util.ArrayList; import java.util.Arrays; import java.util.Map; import java.util.TreeMap; import java.util.stream.Collectors; Loading Loading @@ -423,6 +424,14 @@ public class LegacyProtoLogImpl implements IProtoLog { for (IProtoLogGroup group : protoLogGroups) { mLogGroups.put(group.name(), group); } final var hasGroupsLoggingToLogcat = Arrays.stream(protoLogGroups) .anyMatch(IProtoLogGroup::isLogToLogcat); final ILogger logger = (msg) -> Slog.i(TAG, msg); if (hasGroupsLoggingToLogcat) { mViewerConfig.loadViewerConfig(logger, mLegacyViewerConfigFilename); } } }
tests/Internal/src/com/android/internal/protolog/LegacyProtoLogImplTest.java +7 −0 Original line number Diff line number Diff line Loading @@ -214,6 +214,13 @@ public class LegacyProtoLogImplTest { verify(mReader, never()).getViewerString(anyLong()); } @Test public void loadViewerConfigOnLogcatGroupRegistration() { TestProtoLogGroup.TEST_GROUP.setLogToLogcat(true); mProtoLog.registerGroups(TestProtoLogGroup.TEST_GROUP); verify(mReader).loadViewerConfig(any(), any()); } private static class ProtoLogData { Long mMessageHash = null; Long mElapsedTime = null; Loading