commit aa86c9aaf55f53a558ebb3fdfc31b0628ab75f6f
author Alan Viverette <alanv@google.com> Thu Sep 05 12:33:48 2019 -0400
committer Alan Viverette <alanv@google.com> Thu Sep 05 12:33:48 2019 -0400
tree 472e6a5743017f3f3734c0ea1e700c21943a5136
parent 03c291a212dd412bbfe44de07e7256b91bdf568e

Update CtsThemeHostTestCases to recognize x86_64 emulator

Bug: 140343500
Test: ThemeHostTest
Change-Id: Ic7fd0e3c3dbc21e96f323c55259838d1d0157785

hostsidetests/theme/src/android/theme/cts/ThemeHostTest.java

diff --git a/hostsidetests/theme/src/android/theme/cts/ThemeHostTest.java b/hostsidetests/theme/src/android/theme/cts/ThemeHostTest.java
index f31b081..2fcbb5b 100644
--- a/hostsidetests/theme/src/android/theme/cts/ThemeHostTest.java
+++ b/hostsidetests/theme/src/android/theme/cts/ThemeHostTest.java
@@ -295,7 +295,7 @@
 
     private static int getDensityForDevice(ITestDevice device) throws DeviceNotAvailableException {
         final String densityProp;
-        if (device.getSerialNumber().startsWith("emulator-")) {
+        if (isEmulator(device)) {
             densityProp = DENSITY_PROP_EMULATOR;
         } else {
             densityProp = DENSITY_PROP_DEVICE;
@@ -308,4 +308,9 @@
                 || hardwareTypeString.contains("android.hardware.type.television")
                 || hardwareTypeString.contains("android.hardware.type.automotive");
     }
+
+    private static boolean isEmulator(ITestDevice device) {
+        // Expecting something like "emulator-XXXX" or "EMULATORXXXX".
+        return device.getSerialNumber().toLowerCase().startsWith("emulator");
+    }
 }