| commit | a42b32d5b2b1023b9f1e894f015d2a15733c259a | [log] [tgz] |
|---|---|---|
| author | Jiyong Park <jiyong@google.com> | Mon Oct 17 13:26:23 2022 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Mon Oct 17 13:26:23 2022 +0000 |
| tree | d61123324052c469e4fa4b586154afd1006cc47d | |
| parent | 1297e9d2706ce5dcc31038f473267f009327d97b [diff] | |
| parent | c6930847115da384171b3eefb0fe3d62768cc8be [diff] |
Merge "Use ro.product.vendor.device to determine if running on Cuttlefish"
diff --git a/tests/helper/src/java/com/android/microdroid/test/device/MicrodroidDeviceTestBase.java b/tests/helper/src/java/com/android/microdroid/test/device/MicrodroidDeviceTestBase.java index c2fd295..3052c85 100644 --- a/tests/helper/src/java/com/android/microdroid/test/device/MicrodroidDeviceTestBase.java +++ b/tests/helper/src/java/com/android/microdroid/test/device/MicrodroidDeviceTestBase.java
@@ -49,7 +49,8 @@ public abstract class MicrodroidDeviceTestBase { public static boolean isCuttlefish() { - return VirtualizationTestHelper.isCuttlefish(SystemProperties.get("ro.product.name")); + return VirtualizationTestHelper.isCuttlefish( + SystemProperties.get("ro.product.vendor.device")); } public static String getMetricPrefix() {
diff --git a/tests/helper/src/java/com/android/virt/VirtualizationTestHelper.java b/tests/helper/src/java/com/android/virt/VirtualizationTestHelper.java index c6c0ad0..4c27915 100644 --- a/tests/helper/src/java/com/android/virt/VirtualizationTestHelper.java +++ b/tests/helper/src/java/com/android/virt/VirtualizationTestHelper.java
@@ -16,11 +16,7 @@ package com.android.virt; public abstract class VirtualizationTestHelper { - public static boolean isCuttlefish(String productName) { - return (null != productName) - && (productName.startsWith("aosp_cf_x86") - || productName.startsWith("aosp_cf_arm") - || productName.startsWith("cf_x86") - || productName.startsWith("cf_arm")); + public static boolean isCuttlefish(String vendorDeviceName) { + return vendorDeviceName != null && vendorDeviceName.startsWith("vsoc_"); } }
diff --git a/tests/hostside/helper/java/com/android/microdroid/test/host/MicrodroidHostTestCaseBase.java b/tests/hostside/helper/java/com/android/microdroid/test/host/MicrodroidHostTestCaseBase.java index 2df829c..6346288 100644 --- a/tests/hostside/helper/java/com/android/microdroid/test/host/MicrodroidHostTestCaseBase.java +++ b/tests/hostside/helper/java/com/android/microdroid/test/host/MicrodroidHostTestCaseBase.java
@@ -95,7 +95,8 @@ } protected boolean isCuttlefish() throws Exception { - return VirtualizationTestHelper.isCuttlefish(getDevice().getProperty("ro.product.name")); + return VirtualizationTestHelper.isCuttlefish( + getDevice().getProperty("ro.product.vendor.device")); } protected String getMetricPrefix() throws Exception {