commit cfcf2ee11b3514021b06e0885fa7fb60ba79b0fa
author Andrew Walbran <qwandor@google.com> Fri Feb 04 10:29:37 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Feb 04 10:29:37 2022 +0000
tree dfcfe3f7c148adbb3eddcd2d699f56285a2ba309
parent 9cd73e476e3eb6cf671743ff33db464a5e7df4f8
parent f6d600f82d8fcbaca617419cee8ee6d16290a34a

Merge "Fixed typo in log messages, and adjusted log levels."

javalib/src/android/system/virtualmachine/VirtualMachineConfig.java

diff --git a/javalib/src/android/system/virtualmachine/VirtualMachineConfig.java b/javalib/src/android/system/virtualmachine/VirtualMachineConfig.java
index 04a90e0..35d600a 100644
--- a/javalib/src/android/system/virtualmachine/VirtualMachineConfig.java
+++ b/javalib/src/android/system/virtualmachine/VirtualMachineConfig.java
@@ -206,6 +206,9 @@
             // TODO(jiyong): should we treat APP_ONLY and FULL the same?
             return false;
         }
+        if (this.mProtectedVm != other.mProtectedVm) {
+            return false;
+        }
         return true;
     }
 

tests/aidl/Android.bp

diff --git a/tests/aidl/Android.bp b/tests/aidl/Android.bp
index 893ec0b..a2315ce 100644
--- a/tests/aidl/Android.bp
+++ b/tests/aidl/Android.bp
@@ -9,7 +9,7 @@
     backend: {
         java: {
             platform_apis: true,
-            gen_rpc: true,
+            require_rpc: true,
         },
         cpp: {
             enabled: true,