commit 212f7006ac7e77b6de7f3f9a160972db0001c4c5
author Andrew Walbran <qwandor@google.com> Thu Feb 03 11:48:28 2022 +0000
committer Andrew Walbran <qwandor@google.com> Thu Feb 03 12:00:04 2022 +0000
tree 02b1e745788b94d681805f36cf2c718e3f7a38c0
parent 1bc1679f66853ff604ed218abc921585a6cc4552

Protected and unprotected VMs are not considered compatible.

Pointed out by Jiyong after submission of https://r.android.com/1963701.

Test: mm
Change-Id: Ifceab5bd765b2ba9d623a2115979cc848c9b4398

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;
     }