Check ro.vendor.api_level first in ensureVmUpdatableSupported()
Change getVendorApiLevel to getVsrApiLevel, which checks first the value
of ro.vendor.api_level. getVendorApiLevel gets ro.board.api_level, which
can be updated.
Bug: 378406246
Test: TH
Change-Id: Icf69412301a86ccf5086f965937c303d3c421fd8
diff --git a/tests/hostside/java/com/android/microdroid/test/MicrodroidHostTests.java b/tests/hostside/java/com/android/microdroid/test/MicrodroidHostTests.java
index 59a57f1..5513af6 100644
--- a/tests/hostside/java/com/android/microdroid/test/MicrodroidHostTests.java
+++ b/tests/hostside/java/com/android/microdroid/test/MicrodroidHostTests.java
@@ -1463,7 +1463,7 @@
}
private void ensureUpdatableVmSupported() throws DeviceNotAvailableException {
- if (PropertyUtil.isVendorApiLevelAtLeast(getAndroidDevice(), 202504)) {
+ if (PropertyUtil.getVsrApiLevel(getAndroidDevice()) >= 202504) {
assertTrue(
"Missing Updatable VM support, have you declared Secretkeeper interface?",
isUpdatableVmSupported());