Merge "Update to proto metrics testRunEnded" into pi-dev

1 files changed, 4 insertions, 2 deletions

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.config.Option;
 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 @@ public class CameraTestBase implements IDeviceTest, IRemoteTest, IConfigurationR
         }
 
         @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);
         }