Snap for 4565898 from 0255b2d74e55fd75857546537401434ef361a7f7 to pi-release

Change-Id: I651a0955854007d9cf1305dfa861df96844c6870

20 files changed, 20 insertions, 0 deletions

diff --git a/audio_loopback_test/AndroidTest.xml b/audio_loopback_test/AndroidTest.xml
index 4b2900c..1dd35af 100644
--- a/audio_loopback_test/AndroidTest.xml
+++ b/audio_loopback_test/AndroidTest.xml
@@ -14,6 +14,7 @@
      limitations under the License.
 -->
 <configuration description="Config for VTS Sensor Module HIDL Audio Loopback test case">
+    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="HostDrivenTest.push" />
         <option name="cleanup" value="true" />
diff --git a/binder_benchmark/binder_performance_systrace_test/AndroidTest.xml b/binder_benchmark/binder_performance_systrace_test/AndroidTest.xml
index 7a9063f..8ad82e7 100644
--- a/binder_benchmark/binder_performance_systrace_test/AndroidTest.xml
+++ b/binder_benchmark/binder_performance_systrace_test/AndroidTest.xml
@@ -14,6 +14,7 @@
      limitations under the License.
 -->
 <configuration description="Config for VTS libbinder performance benchmarks with systrace">
+    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="abort-on-push-failure" value="false" />
         <option name="push-group" value="HostDrivenTest.push" />
diff --git a/binder_benchmark/binder_performance_test/AndroidTest.xml b/binder_benchmark/binder_performance_test/AndroidTest.xml
index 679eaa6..98e22d1 100644
--- a/binder_benchmark/binder_performance_test/AndroidTest.xml
+++ b/binder_benchmark/binder_performance_test/AndroidTest.xml
@@ -14,6 +14,7 @@
      limitations under the License.
 -->
 <configuration description="Config for VTS libbinder performance benchmarks">
+    <option name="config-descriptor:metadata" key="plan" value="vts-performance" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="abort-on-push-failure" value="false" />
         <option name="push-group" value="HostDrivenTest.push" />
diff --git a/binder_throughput_test/binder_throughput_benchmark/AndroidTest.xml b/binder_throughput_test/binder_throughput_benchmark/AndroidTest.xml
index 9183ebb..64d58f6 100644
--- a/binder_throughput_test/binder_throughput_benchmark/AndroidTest.xml
+++ b/binder_throughput_test/binder_throughput_benchmark/AndroidTest.xml
@@ -14,6 +14,7 @@
      limitations under the License.
 -->
 <configuration description="Config for VTS BinderThroughputBenchmark test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-performance" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="abort-on-push-failure" value="false" />
         <option name="push-group" value="HostDrivenTest.push" />
diff --git a/binder_throughput_test/binder_throughput_benchmark_systrace/AndroidTest.xml b/binder_throughput_test/binder_throughput_benchmark_systrace/AndroidTest.xml
index d655248..d4c17e4 100644
--- a/binder_throughput_test/binder_throughput_benchmark_systrace/AndroidTest.xml
+++ b/binder_throughput_test/binder_throughput_benchmark_systrace/AndroidTest.xml
@@ -14,6 +14,7 @@
      limitations under the License.
 -->
 <configuration description="Config for VTS BinderThroughputBenchmark test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="abort-on-push-failure" value="false" />
         <option name="push-group" value="HostDrivenTest.push" />
diff --git a/fmq_benchmark/AndroidTest.xml b/fmq_benchmark/AndroidTest.xml
index 483f1fe..6f74c32 100644
--- a/fmq_benchmark/AndroidTest.xml
+++ b/fmq_benchmark/AndroidTest.xml
@@ -14,6 +14,7 @@
      limitations under the License.
 -->
 <configuration description="Config for VTS fmq performance benchmarks">
+    <option name="config-descriptor:metadata" key="plan" value="vts-performance" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="abort-on-push-failure" value="false" />
         <option name="push-group" value="HostDrivenTest.push" />
diff --git a/hal_coverage_measurement/AndroidTest.xml b/hal_coverage_measurement/AndroidTest.xml
index 82b7564..dee83de 100644
--- a/hal_coverage_measurement/AndroidTest.xml
+++ b/hal_coverage_measurement/AndroidTest.xml
@@ -14,6 +14,7 @@
      limitations under the License.
 -->
 <configuration description="Config for Vts Hal Coverage Measurement test case">
+    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
     <target_preparer class="com.android.tradefed.targetprep.VtsCoveragePreparer" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="HalHidlHostTest.push" />
diff --git a/hidl_trace_recorder/AndroidTest.xml b/hidl_trace_recorder/AndroidTest.xml
index e9771b6..512ec55 100644
--- a/hidl_trace_recorder/AndroidTest.xml
+++ b/hidl_trace_recorder/AndroidTest.xml
@@ -14,6 +14,7 @@
      limitations under the License.
 -->
 <configuration description="Config for VTS Sensor Module HIDL Trace Recoder test case">
+    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group-remount-system" value="true" />
         <option name="push-group" value="RecordReplayTest.push" />
diff --git a/hwbinder_benchmark/binderize/AndroidTest.xml b/hwbinder_benchmark/binderize/AndroidTest.xml
index bfd178d..f29a41b 100644
--- a/hwbinder_benchmark/binderize/AndroidTest.xml
+++ b/hwbinder_benchmark/binderize/AndroidTest.xml
@@ -14,6 +14,7 @@
      limitations under the License.
 -->
 <configuration description="Config for VTS libhwbinder performance benchmarks">
+    <option name="config-descriptor:metadata" key="plan" value="vts-performance" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="abort-on-push-failure" value="false" />
         <option name="push-group" value="HostDrivenTest.push" />
diff --git a/hwbinder_benchmark/binderize_systrace/AndroidTest.xml b/hwbinder_benchmark/binderize_systrace/AndroidTest.xml
index cc2f05d..892ac55 100644
--- a/hwbinder_benchmark/binderize_systrace/AndroidTest.xml
+++ b/hwbinder_benchmark/binderize_systrace/AndroidTest.xml
@@ -14,6 +14,7 @@
      limitations under the License.
 -->
 <configuration description="Config for VTS libhwbinder performance benchmarks">
+    <option name="config-descriptor:metadata" key="plan" value="vts-performance-systrace" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="abort-on-push-failure" value="false" />
         <option name="push-group" value="HostDrivenTest.push" />
diff --git a/hwbinder_benchmark/passthrough/AndroidTest.xml b/hwbinder_benchmark/passthrough/AndroidTest.xml
index 413c1e8..bac628c 100644
--- a/hwbinder_benchmark/passthrough/AndroidTest.xml
+++ b/hwbinder_benchmark/passthrough/AndroidTest.xml
@@ -14,6 +14,7 @@
      limitations under the License.
 -->
 <configuration description="Config for VTS libhwbinder performance benchmarks">
+    <option name="config-descriptor:metadata" key="plan" value="vts-performance" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="abort-on-push-failure" value="false" />
         <option name="push-group" value="HostDrivenTest.push" />
diff --git a/hwbinder_benchmark/passthrough_systrace/AndroidTest.xml b/hwbinder_benchmark/passthrough_systrace/AndroidTest.xml
index b962159..ac936e4 100644
--- a/hwbinder_benchmark/passthrough_systrace/AndroidTest.xml
+++ b/hwbinder_benchmark/passthrough_systrace/AndroidTest.xml
@@ -14,6 +14,7 @@
      limitations under the License.
 -->
 <configuration description="Config for VTS libhwbinder performance benchmarks">
+    <option name="config-descriptor:metadata" key="plan" value="vts-performance-systrace" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="abort-on-push-failure" value="false" />
         <option name="push-group" value="HostDrivenTest.push" />
diff --git a/hwbinder_latency_test/binderize/AndroidTest.xml b/hwbinder_latency_test/binderize/AndroidTest.xml
index 8e07924..ee67c2c 100644
--- a/hwbinder_latency_test/binderize/AndroidTest.xml
+++ b/hwbinder_latency_test/binderize/AndroidTest.xml
@@ -14,6 +14,7 @@
      limitations under the License.
 -->
 <configuration description="Config for VTS libhwbinder latency tests">
+    <option name="config-descriptor:metadata" key="plan" value="vts-performance" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="abort-on-push-failure" value="false" />
         <option name="push-group" value="HostDrivenTest.push" />
diff --git a/hwbinder_latency_test/binderize_systrace/AndroidTest.xml b/hwbinder_latency_test/binderize_systrace/AndroidTest.xml
index d7ad27f..5f618b9 100644
--- a/hwbinder_latency_test/binderize_systrace/AndroidTest.xml
+++ b/hwbinder_latency_test/binderize_systrace/AndroidTest.xml
@@ -14,6 +14,7 @@
      limitations under the License.
 -->
 <configuration description="Config for VTS libhwbinder latency tests with systrace">
+    <option name="config-descriptor:metadata" key="plan" value="vts-performance-systrace" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="abort-on-push-failure" value="false" />
         <option name="push-group" value="HostDrivenTest.push" />
diff --git a/hwbinder_latency_test/passthrough/AndroidTest.xml b/hwbinder_latency_test/passthrough/AndroidTest.xml
index 99364df..68d793b 100644
--- a/hwbinder_latency_test/passthrough/AndroidTest.xml
+++ b/hwbinder_latency_test/passthrough/AndroidTest.xml
@@ -14,6 +14,7 @@
      limitations under the License.
 -->
 <configuration description="Config for VTS libhwbinder latency tests">
+    <option name="config-descriptor:metadata" key="plan" value="vts-performance" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="abort-on-push-failure" value="false" />
         <option name="push-group" value="HostDrivenTest.push" />
diff --git a/hwbinder_latency_test/passthrough_systrace/AndroidTest.xml b/hwbinder_latency_test/passthrough_systrace/AndroidTest.xml
index 94cef5e..381d7a8 100644
--- a/hwbinder_latency_test/passthrough_systrace/AndroidTest.xml
+++ b/hwbinder_latency_test/passthrough_systrace/AndroidTest.xml
@@ -14,6 +14,7 @@
      limitations under the License.
 -->
 <configuration description="Config for VTS libhwbinder latency tests with systrace">
+    <option name="config-descriptor:metadata" key="plan" value="vts-performance-systrace" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="abort-on-push-failure" value="false" />
         <option name="push-group" value="HostDrivenTest.push" />
diff --git a/hwbinder_throughput_test/binderize/AndroidTest.xml b/hwbinder_throughput_test/binderize/AndroidTest.xml
index 93593bc..0982a10 100644
--- a/hwbinder_throughput_test/binderize/AndroidTest.xml
+++ b/hwbinder_throughput_test/binderize/AndroidTest.xml
@@ -14,6 +14,7 @@
      limitations under the License.
 -->
 <configuration description="Config for VTS HwBinderThroughputBenchmark test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-performance" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="abort-on-push-failure" value="false" />
         <option name="push-group" value="HostDrivenTest.push" />
diff --git a/hwbinder_throughput_test/binderize_systrace/AndroidTest.xml b/hwbinder_throughput_test/binderize_systrace/AndroidTest.xml
index 0f70d53..e8f84a0 100644
--- a/hwbinder_throughput_test/binderize_systrace/AndroidTest.xml
+++ b/hwbinder_throughput_test/binderize_systrace/AndroidTest.xml
@@ -14,6 +14,7 @@
      limitations under the License.
 -->
 <configuration description="Config for VTS HwBinderThroughputBenchmark test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-performance-systrace" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="abort-on-push-failure" value="false" />
         <option name="push-group" value="HostDrivenTest.push" />
diff --git a/hwbinder_throughput_test/passthrough/AndroidTest.xml b/hwbinder_throughput_test/passthrough/AndroidTest.xml
index 34079e7..5993c7e 100644
--- a/hwbinder_throughput_test/passthrough/AndroidTest.xml
+++ b/hwbinder_throughput_test/passthrough/AndroidTest.xml
@@ -14,6 +14,7 @@
      limitations under the License.
 -->
 <configuration description="Config for VTS HwBinderThroughputBenchmark test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-performance" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="abort-on-push-failure" value="false" />
         <option name="push-group" value="HostDrivenTest.push" />
diff --git a/hwbinder_throughput_test/passthrough_systrace/AndroidTest.xml b/hwbinder_throughput_test/passthrough_systrace/AndroidTest.xml
index b9d08e5..24cf8f9 100644
--- a/hwbinder_throughput_test/passthrough_systrace/AndroidTest.xml
+++ b/hwbinder_throughput_test/passthrough_systrace/AndroidTest.xml
@@ -14,6 +14,7 @@
      limitations under the License.
 -->
 <configuration description="Config for VTS HwBinderThroughputBenchmark test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-performance-systrace" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="abort-on-push-failure" value="false" />
         <option name="push-group" value="HostDrivenTest.push" />