diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-08-03 21:13:37 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-03 21:13:37 +0000 |
| commit | 32a03c16c53ac793bd98c2e06983b995eb4cf9db (patch) | |
| tree | 9d05bebc0f66dde418a2c76a059ddd461d115655 | |
| parent | f514762a5622924d1fb7865d3718234aab5322cd (diff) | |
| parent | be988d295f294925bb8481e11c462fdfedb76d76 (diff) | |
| download | tradefederation-32a03c16c53ac793bd98c2e06983b995eb4cf9db.tar.gz | |
Merge "Add MP4s to the list of output log types." am: be988d295f
Original change: https://android-review.googlesource.com/c/platform/tools/tradefederation/+/1385295
Change-Id: I905857ddcdeb46f0732d4329b29935facf96b304
| -rw-r--r-- | src/com/android/tradefed/device/metric/FilePullerLogCollector.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/tradefed/device/metric/FilePullerLogCollector.java b/src/com/android/tradefed/device/metric/FilePullerLogCollector.java index 75cb203e8..547443387 100644 --- a/src/com/android/tradefed/device/metric/FilePullerLogCollector.java +++ b/src/com/android/tradefed/device/metric/FilePullerLogCollector.java @@ -42,9 +42,10 @@ public class FilePullerLogCollector extends FilePullerDeviceMetricCollector { String ext = FileUtil.getExtension(metricFile.getName()).toLowerCase(); if (".png".equals(ext)) { type = LogDataType.PNG; - } - if (".pb".equals(ext)) { + } else if (".pb".equals(ext)) { type = LogDataType.PB; + } else if (".mp4".equals(ext)) { + type = LogDataType.MP4; } testLog(metricFile.getName(), type, source); } |