diff options
| author | Copybara <no-reply@google.com> | 2024-03-28 15:52:26 -0700 |
|---|---|---|
| committer | Aurimas Liutikas <aurimas@google.com> | 2024-04-01 23:38:38 +0000 |
| commit | c4bfbec12c6d7d95aa9e5449a9eb4e2868f4dc97 (patch) | |
| tree | bdecea5c208f530ea511851daffc15427ca06095 | |
| parent | 95c5fc9554b69de5950e93569659037974a71c33 (diff) | |
| download | tradefederation-c4bfbec12c6d7d95aa9e5449a9eb4e2868f4dc97.tar.gz | |
No public description
PiperOrigin-RevId: 620080764
Change-Id: I4679e7396dc72777fe92c9153623f3a9d805c267
| -rw-r--r-- | common_util/com/android/tradefed/result/LogDataType.java | 5 | ||||
| -rw-r--r-- | src/com/android/tradefed/device/metric/FilePullerLogCollector.java | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/common_util/com/android/tradefed/result/LogDataType.java b/common_util/com/android/tradefed/result/LogDataType.java index ec088c97e..98d73c3b3 100644 --- a/common_util/com/android/tradefed/result/LogDataType.java +++ b/common_util/com/android/tradefed/result/LogDataType.java @@ -51,6 +51,11 @@ public enum LogDataType { "application/octet-stream", false, // Not compressed by default, so we can gzip them false), // binary proto perfetto trace file + TRACE( + "trace", + "application/octet-stream", + false, // Not compressed by default, so we can gzip them + false), // binary method trace file /* Specific text file types */ ANRS("txt", "text/plain", true, true), BUGREPORT("txt", "text/plain", false, true), diff --git a/src/com/android/tradefed/device/metric/FilePullerLogCollector.java b/src/com/android/tradefed/device/metric/FilePullerLogCollector.java index 52adbef41..2c53b6336 100644 --- a/src/com/android/tradefed/device/metric/FilePullerLogCollector.java +++ b/src/com/android/tradefed/device/metric/FilePullerLogCollector.java @@ -57,6 +57,8 @@ public class FilePullerLogCollector extends FilePullerDeviceMetricCollector { } else if (".textproto".equals(ext) && FileUtil.getBaseName(metricFile.getName()).contains("_goldResult")) { type = LogDataType.GOLDEN_RESULT_PROTO; + } else if (".trace".equals(ext)) { + type = LogDataType.TRACE; } else if (".log".equals(ext)) { type = LogDataType.BT_SNOOP_LOG; } else if (".json".equals(ext)) { |