commit 6900eed9ba1e3661d281aacfc7568f011c4ee3b0
author Julien Desprez <jdesprez@google.com> Tue May 22 12:40:17 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue May 22 12:40:17 2018 -0700
tree 2705c704bd37150963a664dc6915e3a322f686f8
parent 82202f556cbcdf7b5d5de1b0477558a30cda5ec9
parent 191f1730ab3d8f0be1d338cf8fdf30ba2bb14172

Update to proto interface metric
am: 191f1730ab

Change-Id: I446028b69966153082c7928f1e10a967e90a23c3

.classpath

diff --git a/.classpath b/.classpath
index 60e2e17..8bd8feb 100644
--- a/.classpath
+++ b/.classpath
@@ -4,5 +4,6 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/ddmlib"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/tradefederation"/>
+	<classpathentry kind="var" path="TRADEFED_ROOT/out/host/common/obj/JAVA_LIBRARIES/host-libprotobuf-java-full_intermediates/classes.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

src/com/android/example/RebootTest.java

diff --git a/src/com/android/example/RebootTest.java b/src/com/android/example/RebootTest.java
index 8a481d5..c9c5159 100644
--- a/src/com/android/example/RebootTest.java
+++ b/src/com/android/example/RebootTest.java
@@ -20,13 +20,13 @@
 import com.android.tradefed.device.DeviceNotAvailableException;
 import com.android.tradefed.device.IManagedTestDevice;
 import com.android.tradefed.device.ITestDevice;
+import com.android.tradefed.metrics.proto.MetricMeasurement.Metric;
 import com.android.tradefed.result.ITestInvocationListener;
 import com.android.tradefed.result.TestDescription;
 import com.android.tradefed.testtype.IDeviceTest;
 import com.android.tradefed.testtype.IRemoteTest;
 
-import java.util.Collections;
-import java.util.Map;
+import java.util.HashMap;
 
 /**
  * Reboots the device and verifies it comes back online.
@@ -44,7 +44,7 @@
     @Override
     public void run(ITestInvocationListener listener) throws DeviceNotAvailableException {
         long start;
-        Map<String, String> emptyMap = Collections.emptyMap();
+        HashMap<String, Metric> emptyMap = new HashMap<>();
         TestDescription testId;
         start = System.currentTimeMillis();
         listener.testRunStarted(String.format("#%d device reboots", mNumDeviceReboots),
@@ -56,9 +56,10 @@
                 listener.testStarted(testId);
                 try {
                     getDevice().nonBlockingReboot();
-                    if (((IManagedTestDevice)getDevice()).getMonitor().waitForDeviceOnline() == null) {
+                    if (((IManagedTestDevice) getDevice()).getMonitor().waitForDeviceOnline()
+                            == null) {
                         listener.testFailed(testId, "Reboot failed");
-                        ((IManagedTestDevice)getDevice()).recoverDevice();
+                        ((IManagedTestDevice) getDevice()).recoverDevice();
                     }
                 }
                 finally {