| commit | 96960794b5f1032047083e1c9c1c97a1e2329536 | [log] [tgz] |
|---|---|---|
| author | Elie Kheirallah <khei@google.com> | Fri Mar 07 09:39:25 2025 -0800 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Mar 07 09:39:25 2025 -0800 |
| tree | 00d272c1e7bdbb8adccc2ecfc37e22947a181a31 | |
| parent | 594891fd2b15e33a0abad14ea6f0e6e2ed3b75e7 [diff] | |
| parent | 724bb5f32b23595d9211540149e0161ea672a433 [diff] |
Merge "Check ro.vendor.api_level first in ensureVmUpdatableSupported()" into main am: 724bb5f32b Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3528997 Change-Id: Id3295040193b7725391375fe167471e8f339b289 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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());