commit c7587ed0da9e1fdd56c659c5b5ec5c65a1f11ed9
author frankfeng <frankfeng@google.com> Wed Sep 29 19:50:59 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Sep 29 19:50:59 2021 +0000
tree 9d34890e62506a8205768973ff596c30dd5a8b28
parent 189544b3cd932c18df2241f2f048f903765caccb
parent 14f0c84a4b79cfaaf30acb7b10d6f0fcdfba4ff0

Migrate off deprecated mockito APIs am: 14f0c84a4b

Original change: https://android-review.googlesource.com/c/platform/tools/tradefederation/contrib/+/1840404

Change-Id: I791d994193c34921f8301730c48b0e84c3d359c3

src/com/android/media/tests/CameraPerformanceTest.java

diff --git a/src/com/android/media/tests/CameraPerformanceTest.java b/src/com/android/media/tests/CameraPerformanceTest.java
index b3fefcc..271fedf 100644
--- a/src/com/android/media/tests/CameraPerformanceTest.java
+++ b/src/com/android/media/tests/CameraPerformanceTest.java
@@ -63,6 +63,7 @@
             new ImmutableMultimap.Builder<String, String>()
                     .put(TEST_CAMERA_LAUNCH, "Camera launch time")
                     .put(TEST_CAMERA_LAUNCH, "Camera start preview time")
+                    .put(TEST_CAMERA_LAUNCH, "Camera camera close time")
                     .put(TEST_SINGLE_CAPTURE, "Camera capture result latency")
                     .put(TEST_REPROCESSING_LATENCY, "YUV reprocessing shot to shot latency")
                     .put(TEST_REPROCESSING_LATENCY, "opaque reprocessing shot to shot latency")

src/com/android/media/tests/CameraTestMetricsCollectionListener.java

diff --git a/src/com/android/media/tests/CameraTestMetricsCollectionListener.java b/src/com/android/media/tests/CameraTestMetricsCollectionListener.java
index b402efd..5a5c99d 100644
--- a/src/com/android/media/tests/CameraTestMetricsCollectionListener.java
+++ b/src/com/android/media/tests/CameraTestMetricsCollectionListener.java
@@ -19,6 +19,7 @@
 import com.android.tradefed.log.LogUtil;
 import com.android.tradefed.metrics.proto.MetricMeasurement;
 import com.android.tradefed.result.CollectingTestListener;
+import com.android.tradefed.result.FailureDescription;
 import com.android.tradefed.result.FileInputStreamSource;
 import com.android.tradefed.result.ITestInvocationListener;
 import com.android.tradefed.result.InputStreamSource;
@@ -90,6 +91,12 @@
         mFatalErrors.put(mCameraTestBase.getRuKey(), errorMessage);
     }
 
+        @Override
+        public void testRunFailed(FailureDescription failure) {
+            super.testRunFailed(failure);
+            mFatalErrors.put(mCameraTestBase.getRuKey(), failure.getErrorMessage());
+        }
+
     @Override
     public void testRunEnded(
             long elapsedTime, HashMap<String, MetricMeasurement.Metric> runMetrics) {