| commit | 8c46b5c4e840292b6f445cbab3a8369871626ce1 | [log] [tgz] |
|---|---|---|
| author | Alice Wang <aliceywang@google.com> | Thu Dec 19 00:49:59 2024 -0800 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Dec 19 00:49:59 2024 -0800 |
| tree | bc039977ebb2839b5ba96f66ef8df9f87e030de6 | |
| parent | 4cde6a27bc50b1572d1b200708a33a3439e26190 [diff] | |
| parent | eb4b89ad561aecb8fdd9d98d5530aa7f90e230aa [diff] |
Merge "Check |ro.vendor.api_level| for vendor API level on GRF/non-GRF chips" into main am: eb4b89ad56 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3417365 Change-Id: I2725b68a704dbead7eb185705cc3f3d7412a6498 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 83dc58e..a932d32 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
@@ -256,11 +256,11 @@ } /** - * @return The first vendor API level when the vendor images for an SoC that is qualified for - * vendor freeze are first released with this property, or 0 if the property is not set. + * @return The vendor API level that the device as a whole must conform to, this value should be + * available on both GRF and non-GRF devices. */ protected static int getFirstVendorApiLevel() { - return SystemProperties.getInt("ro.board.first_api_level", 0); + return SystemProperties.getInt("ro.vendor.api_level", -1); } protected void assumeSupportedDevice() {