| commit | 2d1c773b012a70225eeab96bbfbb6a4e40c7b272 | [log] [tgz] |
|---|---|---|
| author | Elie Kheirallah <khei@google.com> | Fri Mar 07 10:03:21 2025 -0800 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Mar 07 10:03:21 2025 -0800 |
| tree | fefde8fdf61745341a05212c55bc33ae7174cc54 | |
| parent | ca32b4a1aa4b463a3375e9f21881428ee4239d6b [diff] | |
| parent | 96960794b5f1032047083e1c9c1c97a1e2329536 [diff] |
Merge "Check ro.vendor.api_level first in ensureVmUpdatableSupported()" into main am: 724bb5f32b am: 96960794b5 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3528997 Change-Id: Iee521e8fb4425f60160f15bbf0c08c4fc06ce4b4 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());