| commit | 236c58434bf4cdd1a60fb2a78df3cc4ecb858170 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Fri Aug 16 03:15:39 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Aug 16 03:15:39 2024 +0000 |
| tree | 9768a55c7cc91ab9e4c44d2a971e507e64357462 | |
| parent | 355c58e808b36ad6bf77d7ccea86ed10ef8b1d84 [diff] | |
| parent | 190a5f53e34492d4d6b75bdd0e1772875e35d5ce [diff] |
Merge "MicrodroidTest: Relax bccIsSuperficiallyWellFormed check" into main am: 190a5f53e3 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3220115 Change-Id: I82ca68a7be0dbff868fb933f16412deaee8d0b50 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java b/tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java index 1465e73..109bc2e 100644 --- a/tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java +++ b/tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java
@@ -1298,7 +1298,7 @@ // then pvmfw, vm_entry (Microdroid kernel) and Microdroid payload entries. // Before Android V we did not require that vendor code contain any DICE entries // preceding pvmfw, so the minimum is one less. - int minDiceChainSize = getVendorApiLevel() >= 202404 ? 5 : 4; + int minDiceChainSize = getVendorApiLevel() > 202404 ? 5 : 4; assertThat(diceChainSize).isAtLeast(minDiceChainSize); } else { // pvmfw truncates the DICE chain it gets, so we expect exactly entries for