| commit | 22c79fe64a586222de9772cf223273687f172c88 | [log] [tgz] |
|---|---|---|
| author | Jiyong Park <jiyong@google.com> | Wed Jun 05 14:33:40 2024 +0900 |
| committer | Jiyong Park <jiyong@google.com> | Wed Jun 05 14:33:40 2024 +0900 |
| tree | 90d34df89dac3a0dc93b664891cca8ac486ecec5 | |
| parent | 11c152d34c5a1b57edf0691466360f661777ed7e [diff] |
Use ro.board.api_level to check whether BSP is under VSR-15 or not Non-GRF devices upgrading their vendor to Android 15 should support AVF. Bug: 340429921 Test: run MicrodroidTestApp on upgrading Pixels Change-Id: I7bd69b4c4f6b9d8ab21e7a9e80d7a370fe6ada6f
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 c6b2499..b7ac827 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;