tradefederation/contrib: Merge remote-tracking branch 'goog/master' into stage-aosp-master
am: 1c7ed5a6c2
Change-Id: I353424997137b0d98af4f06af89a8987b4a7acb3
diff --git a/OWNERS b/OWNERS
index 73ce5af..795ca9c 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1 +1,9 @@
-# This directory has no default owner.
+# TODO (sbasi) Restore this file after AOSP Migration.
+erowe@google.com
+guangzhu@google.com
+jdesprez@google.com
+kevcheng@google.com
+mikehoran@google.com
+moonk@google.com
+sbasi@google.com
+tsu@google.com
diff --git a/res/config/google/test/framework/media/camera-burst-shot.xml b/res/config/google/test/framework/media/camera-burst-shot.xml
index bd35349..c5d8694 100644
--- a/res/config/google/test/framework/media/camera-burst-shot.xml
+++ b/res/config/google/test/framework/media/camera-burst-shot.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2017 Google Inc. All Rights Reserved -->
<configuration description="Runs a Camera App startup test on device">
+ <target_preparer class="com.android.tradefed.targetprep.DeviceSetup" />
<target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup" />
<target_preparer class="com.android.tradefed.targetprep.PushFilePreparer" />
<target_preparer class="com.android.tradefed.targetprep.InstallApkSetup" />
diff --git a/res/config/google/test/framework/media/camera-shot-latency.xml b/res/config/google/test/framework/media/camera-shot-latency.xml
index 74ccbaa..6106e0f 100644
--- a/res/config/google/test/framework/media/camera-shot-latency.xml
+++ b/res/config/google/test/framework/media/camera-shot-latency.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2015 Google Inc. All Rights Reserved -->
<configuration description="Runs a Camera app latency test on device">
+ <target_preparer class="com.android.tradefed.targetprep.DeviceSetup" />
<target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup" />
<target_preparer class="com.android.tradefed.targetprep.InstallApkSetup" />
<target_preparer class="com.android.tradefed.targetprep.DeviceCleaner" />
diff --git a/res/config/google/test/framework/media/camera-startup.xml b/res/config/google/test/framework/media/camera-startup.xml
index 608bd59..db3e15f 100644
--- a/res/config/google/test/framework/media/camera-startup.xml
+++ b/res/config/google/test/framework/media/camera-startup.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2015 Google Inc. All Rights Reserved -->
<configuration description="Runs a Camera App startup test on device">
+ <target_preparer class="com.android.tradefed.targetprep.DeviceSetup" />
<target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup" />
<target_preparer class="com.android.tradefed.targetprep.PushFilePreparer" />
<target_preparer class="com.android.tradefed.targetprep.InstallApkSetup" />
diff --git a/res/config/google/test/framework/media/camera2-latency.xml b/res/config/google/test/framework/media/camera2-latency.xml
index 1de748c..730ca9d 100644
--- a/res/config/google/test/framework/media/camera2-latency.xml
+++ b/res/config/google/test/framework/media/camera2-latency.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2015 Google Inc. All Rights Reserved -->
<configuration description="Runs a Camera app latency test on device">
+ <target_preparer class="com.android.tradefed.targetprep.DeviceSetup" />
<target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup" />
<target_preparer class="com.android.tradefed.targetprep.PushFilePreparer" />
<target_preparer class="com.android.tradefed.targetprep.InstallApkSetup" />
diff --git a/res/config/google/test/framework/media/camera2-stress.xml b/res/config/google/test/framework/media/camera2-stress.xml
index 0bac157..d057c28 100644
--- a/res/config/google/test/framework/media/camera2-stress.xml
+++ b/res/config/google/test/framework/media/camera2-stress.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2015 Google Inc. All Rights Reserved -->
<configuration description="Runs a Camera stress test on device">
+ <target_preparer class="com.android.tradefed.targetprep.DeviceSetup" />
<target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup" />
<target_preparer class="com.android.tradefed.targetprep.PushFilePreparer" />
<target_preparer class="com.android.tradefed.targetprep.InstallApkSetup" />
diff --git a/src/com/android/media/tests/Camera2StressTest.java b/src/com/android/media/tests/Camera2StressTest.java
index 7b770fe..3dd79a2 100644
--- a/src/com/android/media/tests/Camera2StressTest.java
+++ b/src/com/android/media/tests/Camera2StressTest.java
@@ -26,6 +26,7 @@
import com.android.tradefed.result.LogDataType;
import com.android.tradefed.result.TestDescription;
import com.android.tradefed.util.FileUtil;
+import com.android.tradefed.util.proto.TfMetricProtoUtil;
import java.io.BufferedReader;
import java.io.File;
@@ -101,7 +102,7 @@
parseLog(test.getTestName(), namedTestMetrics);
postScreenshotOnFailure(test);
- super.testEnded(test, endTime, namedTestMetrics);
+ super.testEnded(test, endTime, TfMetricProtoUtil.upgradeConvert(namedTestMetrics));
}
private void postScreenshotOnFailure(TestDescription test) {