commit 94501d8127aef88f1870b8d6e7411c6e36538012
author android-build-team Robot <android-build-team-robot@google.com> Sun Jun 03 07:26:05 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Sun Jun 03 07:26:05 2018 +0000
tree 08f193ed90ac9833e6b39aeb503930634af74823
parent 44d09c7498063eb9e481fe32b7cfa4af0251a9f7
parent bdd77e05761541001646bbfdb89783a66d89b109

Snap for 4818534 from bdd77e05761541001646bbfdb89783a66d89b109 to pi-release

Change-Id: I4d01bb8e0d79225ffb2401b81ad87b816d3240b1

PREUPLOAD.cfg

diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg
new file mode 100644
index 0000000..60c5d30
--- /dev/null
+++ b/PREUPLOAD.cfg
@@ -0,0 +1,6 @@
+[Builtin Hooks]
+google_java_format = true
+
+[Tool Paths]
+google-java-format = ${REPO_ROOT}/prebuilts/tools/common/google-java-format/google-java-format
+google-java-format-diff = ${REPO_ROOT}/prebuilts/tools/common/google-java-format/google-java-format-diff.py

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

diff --git a/src/com/android/media/tests/CameraTestBase.java b/src/com/android/media/tests/CameraTestBase.java
index 41ecf39..f077bbb 100644
--- a/src/com/android/media/tests/CameraTestBase.java
+++ b/src/com/android/media/tests/CameraTestBase.java
@@ -23,6 +23,7 @@
 import com.android.tradefed.device.DeviceNotAvailableException;
 import com.android.tradefed.device.ITestDevice;
 import com.android.tradefed.log.LogUtil.CLog;
+import com.android.tradefed.metrics.proto.MetricMeasurement.Metric;
 import com.android.tradefed.result.ByteArrayInputStreamSource;
 import com.android.tradefed.result.CollectingTestListener;
 import com.android.tradefed.result.FileInputStreamSource;
@@ -314,9 +315,10 @@
         }
 
         @Override
-        public void testRunEnded(long elapsedTime, Map<String, String> runMetrics) {
+        public void testRunEnded(long elapsedTime, HashMap<String, Metric> runMetrics) {
             super.testRunEnded(elapsedTime, runMetrics);
-            handleTestRunEnded(mListener, elapsedTime, runMetrics);
+            handleTestRunEnded(mListener, elapsedTime,
+                    TfMetricProtoUtil.compatibleConvert(runMetrics));
             // never be called since handleTestRunEnded will handle it if needed.
             //mListener.testRunEnded(elapsedTime, runMetrics);
         }