commit 724bb5f32b23595d9211540149e0161ea672a433
author Elie Kheirallah <khei@google.com> Fri Mar 07 09:08:12 2025 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 07 09:08:12 2025 -0800
tree 12d0d52ab1800d3a8c03ffea087f48569471cc77
parent 7e32326305d6b9aa18f5b915fae593ba5588c54a
parent adc9a02b4a246a927c08d87e5400ea85ceaf653c

Merge "Check ro.vendor.api_level first in ensureVmUpdatableSupported()" into main

tests/hostside/java/com/android/microdroid/test/MicrodroidHostTests.java

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());