commit fcf4e9a39450ba6229494332435e6958c848016c
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Jul 07 13:15:36 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jul 07 13:15:36 2023 +0000
tree 3de45c586bcc28577f63245c31e31d367ae10a61
parent 505109ae86c8a4c09c39263352f03f5db1aedc9f
parent 628c438606e30751b60683704382df6ccef1b760

Merge "vmbase: Trivial changes to prepare for smccc::trng" into main

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

diff --git a/tests/hostside/java/com/android/microdroid/test/DebugPolicyHostTests.java b/tests/hostside/java/com/android/microdroid/test/DebugPolicyHostTests.java
index 014f9f0..9cf28c7 100644
--- a/tests/hostside/java/com/android/microdroid/test/DebugPolicyHostTests.java
+++ b/tests/hostside/java/com/android/microdroid/test/DebugPolicyHostTests.java
@@ -115,7 +115,7 @@
                 mAndroidDevice.supportsMicrodroid(/* protectedVm= */ true));
         assumeFalse("Test requires setprop for using custom pvmfw and adb root", isUserBuild());
 
-        mAndroidDevice.enableAdbRoot();
+        assumeTrue("Skip if adb root fails", mAndroidDevice.enableAdbRoot());
 
         // tradefed copies the test artfacts under /tmp when running tests,
         // so we should *find* the artifacts with the file name.