commit 0006d2ee51ca1cba301557f4bc941f56fe1659d7
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Nov 18 03:16:23 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Nov 18 03:16:23 2024 +0000
tree 54ff2b2c34815e9a2f7a62be3200a1c334adc667
parent 3e9d905bb65e698f5f0d401a75a3740ca11748f0
parent 27fb206ded30036b86720122c6a759dfa42e71c5

Merge "Revert "Set diagnostics log-data-type to CONNDIAG"" into main

tests/cts/net/AndroidTestTemplate.xml

diff --git a/tests/cts/net/AndroidTestTemplate.xml b/tests/cts/net/AndroidTestTemplate.xml
index 965d1f6..55b6494 100644
--- a/tests/cts/net/AndroidTestTemplate.xml
+++ b/tests/cts/net/AndroidTestTemplate.xml
@@ -61,8 +61,7 @@
     </test>
     <metrics_collector class="com.android.tradefed.device.metric.FilePullerLogCollector">
         <!-- Pattern matching the fileKey used by ConnectivityDiagnosticsCollector when calling addFileMetric -->
-        <option name="pull-pattern-keys" value="com.android.testutils.ConnectivityDiagnosticsCollector.*" />
-        <option name="log-data-type" value="CONNDIAG" />
+        <option name="pull-pattern-keys" value="com.android.testutils.ConnectivityDiagnosticsCollector.*"/>
         <option name="collect-on-run-ended-only" value="true" />
     </metrics_collector>
     <!-- When this test is run in a Mainline context (e.g. with `mts-tradefed`), only enable it if