diff options
| author | 2024-07-08 08:20:23 +0000 | |
|---|---|---|
| committer | 2024-07-08 12:01:01 +0000 | |
| commit | 9732c70a9eb32c1d0f1781afd5ab2748b02cc4a9 (patch) | |
| tree | 06b06291ec35e0f5adcf4a3db9d1ede2c1a1c447 | |
| parent | 90b0fcd3c483d7702750b02dffa7ff831d979d61 (diff) | |
Revert^2 "Initialize ProtoLog instances statically"
6eac90fea4ac35363f3ed857b294de7f74534400
Change-Id: Id761103329edc3ad537566c618564a2fd1ba4597
| -rw-r--r-- | core/java/com/android/internal/protolog/ProtoLog.java | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/core/java/com/android/internal/protolog/ProtoLog.java b/core/java/com/android/internal/protolog/ProtoLog.java index ff46770e2cb9..99d441812fa8 100644 --- a/core/java/com/android/internal/protolog/ProtoLog.java +++ b/core/java/com/android/internal/protolog/ProtoLog.java @@ -169,4 +169,16 @@ public class ProtoLog { sProtoLogInstance.log(logLevel, group, stringMessage, args); } } + + static { + if (android.tracing.Flags.perfettoProtologTracing()) { + sProtoLogInstance = new PerfettoProtoLogImpl(); + } else { + if (REQUIRE_PROTOLOGTOOL) { + throw new RuntimeException("REQUIRE_PROTOLOGTOOL not set to false."); + } else { + sProtoLogInstance = new LogcatOnlyProtoLogImpl(); + } + } + } } |