commit 44cb8c32fa43c16d93e267c636eca3f990934d97
author Josh Gao <jmgao@google.com> Thu Jun 11 13:03:16 2020 -0700
committer Josh Gao <jmgao@google.com> Thu Jun 11 13:03:16 2020 -0700
tree fb98ccabcb2c46637157b03b245a1b65bcab849b
parent bed8e00edca78b9afa520859ac86d2d2f67eb0cf

AdbHostTest: don't run against emulators.

Bug: http://b/158317051
Test: treehugger
Change-Id: I4186d1714c909f20ea9a5a4d6c593bba84208059

hostsidetests/adb/src/android/adb/cts/AdbHostTest.java

diff --git a/hostsidetests/adb/src/android/adb/cts/AdbHostTest.java b/hostsidetests/adb/src/android/adb/cts/AdbHostTest.java
index 11a1ae0..bea7506 100644
--- a/hostsidetests/adb/src/android/adb/cts/AdbHostTest.java
+++ b/hostsidetests/adb/src/android/adb/cts/AdbHostTest.java
@@ -59,8 +59,13 @@
         File check_ms_os_desc = copyResourceToTempFile("/check_ms_os_desc");
         check_ms_os_desc.setExecutable(true);
 
+        String serial = getDevice().getSerialNumber();
+        if (serial.startsWith("emulator-")) {
+            return;
+        }
+
         ProcessBuilder pb = new ProcessBuilder(check_ms_os_desc.getAbsolutePath());
-        pb.environment().put("ANDROID_SERIAL", getDevice().getSerialNumber());
+        pb.environment().put("ANDROID_SERIAL", serial);
         pb.redirectOutput(ProcessBuilder.Redirect.PIPE);
         pb.redirectErrorStream(true);
         Process p = pb.start();