| commit | 3f52ff49de5c2505f768c1717972e4ac7cc9f68e | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Wed Jun 05 07:16:19 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jun 05 07:16:19 2024 +0000 |
| tree | 936776779d64bfa005658a8eb957824367e038b7 | |
| parent | 95348bb036118684fecd71a75a669293c0298c3a [diff] | |
| parent | bf0cef24de82161060d1b90b751576f2223f62d9 [diff] |
Merge "Use ro.board.api_level to check whether BSP is under VSR-15 or not" into main am: bf0cef24de Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3115659 Change-Id: I0041361979de16f58976f9f8347ce8d9ca2f3596 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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 6040531..e02db39 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
@@ -219,7 +219,7 @@ } protected static int getVendorApiLevel() { - return SystemProperties.getInt("ro.vendor.api_level", 0); + return SystemProperties.getInt("ro.board.api_level", 0); } protected void assumeSupportedDevice() {
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 46df011..1fc0f92 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
@@ -140,7 +140,7 @@ assumeTrue("Requires VM support", testDevice.supportsMicrodroid()); CommandRunner android = new CommandRunner(androidDevice); - long vendorApiLevel = androidDevice.getIntProperty("ro.vendor.api_level", 0); + long vendorApiLevel = androidDevice.getIntProperty("ro.board.api_level", 0); boolean isGsi = android.runForResult("[ -e /system/system_ext/etc/init/init.gsi.rc ]").getStatus() == CommandStatus.SUCCESS;