| commit | 855feeaed44b9851a98345a47675cba4f54d44c0 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Fri Aug 16 03:31:32 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Aug 16 03:31:32 2024 +0000 |
| tree | 6b2838ae25423c9f228c85d14855f9dfc715ad8c | |
| parent | b5d9869372d2d9186ec4fb9b0e24bb13f479d201 [diff] | |
| parent | 236c58434bf4cdd1a60fb2a78df3cc4ecb858170 [diff] |
Merge "MicrodroidTest: Relax bccIsSuperficiallyWellFormed check" into main am: 190a5f53e3 am: 236c58434b Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3220115 Change-Id: I07f4162a28ec9d08da1dbb3df9e71ed00532d45e 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