commit bd7ce985ca8eb13c1acf284aa53c9724ec33e27b
author Treehugger Robot <treehugger-gerrit@google.com> Thu May 19 17:43:03 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu May 19 17:43:03 2022 +0000
tree 4c45bf58245b17f441a367467ed396ec3ca151a7
parent 57253db806dacdd1570b222af777b04c6d747a2b
parent 616d13f5dbd74e66bccaf76996f885a762cfcf95

Merge "No need to pass Strong, just a regular reference is fine."

.prebuilt_info/prebuilt_info_pvmfw_pvmfw_img.asciipb

diff --git a/.prebuilt_info/prebuilt_info_pvmfw_pvmfw_img.asciipb b/.prebuilt_info/prebuilt_info_pvmfw_pvmfw_img.asciipb
index 33dfb62..ea17dfc 100644
--- a/.prebuilt_info/prebuilt_info_pvmfw_pvmfw_img.asciipb
+++ b/.prebuilt_info/prebuilt_info_pvmfw_pvmfw_img.asciipb
@@ -1,6 +1,6 @@
 drops {
   android_build_drop {
-    build_id: "8494941"
+    build_id: "8597076"
     target: "u-boot_pvmfw"
     source_file: "pvmfw.img"
   }

pvmfw/pvmfw.img

diff --git a/pvmfw/pvmfw.img b/pvmfw/pvmfw.img
index 6060f4b..9afb092 100644
--- a/pvmfw/pvmfw.img
+++ b/pvmfw/pvmfw.img
Binary files differ

tests/hostside/java/android/virt/test/MicrodroidTestCase.java

diff --git a/tests/hostside/java/android/virt/test/MicrodroidTestCase.java b/tests/hostside/java/android/virt/test/MicrodroidTestCase.java
index e2d4be1..ec2afaa 100644
--- a/tests/hostside/java/android/virt/test/MicrodroidTestCase.java
+++ b/tests/hostside/java/android/virt/test/MicrodroidTestCase.java
@@ -16,7 +16,6 @@
 
 package android.virt.test;
 
-import static android.virt.test.CommandResultSubject.assertThat;
 import static android.virt.test.CommandResultSubject.command_results;
 
 import static com.android.tradefed.testtype.DeviceJUnit4ClassRunner.TestLogData;
@@ -503,11 +502,8 @@
         final String ret =
                 android.runForResult(VIRT_APEX + "bin/vm run", configPath).getStderr().trim();
 
-        assertTrue(
-                "The test should fail with a permission error",
-                ret.contains(
-                        "does not have the android.permission.USE_CUSTOM_VIRTUAL_MACHINE"
-                            + " permission"));
+        assertThat(ret).contains("does not have the android.permission.USE_CUSTOM_VIRTUAL_MACHINE"
+                + " permission");
     }
 
     @Before

tests/testapk/src/native/testbinary.cpp

diff --git a/tests/testapk/src/native/testbinary.cpp b/tests/testapk/src/native/testbinary.cpp
index 9493fc7..422afca 100644
--- a/tests/testapk/src/native/testbinary.cpp
+++ b/tests/testapk/src/native/testbinary.cpp
@@ -143,8 +143,9 @@
             std::cerr << "failed to connect VirtualMachineService\n";
             abort();
         }
-        if (!virtualMachineService->notifyPayloadReady().isOk()) {
-            std::cerr << "failed to notify payload ready to virtualizationservice\n";
+        if (auto status = virtualMachineService->notifyPayloadReady(); !status.isOk()) {
+            std::cerr << "failed to notify payload ready to virtualizationservice: "
+                      << status.getDescription() << std::endl;
             abort();
         }
     };