| commit | 14b982d3b10b3bbd882f33b8dbd1d91a993831ad | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Wed Dec 11 03:40:59 2024 -0800 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Dec 11 03:40:59 2024 -0800 |
| tree | c9c752b403a346f279593c216855afc6857a0110 | |
| parent | c8f90fe4fd2a5bb98422e21dc0bc95f37a1f1d1d [diff] | |
| parent | 6627bfaeb061d23360d2103f2032377f000c9368 [diff] |
Merge "Don't re-create VM instance if the config is compatible" into main am: 6627bfaeb0 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3405220 Change-Id: I22ddad01030bcf427f107629b9980551365869bb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/libs/framework-virtualization/src/android/system/virtualmachine/VirtualMachineConfig.java b/libs/framework-virtualization/src/android/system/virtualmachine/VirtualMachineConfig.java index 3829f9f..d120cd8 100644 --- a/libs/framework-virtualization/src/android/system/virtualmachine/VirtualMachineConfig.java +++ b/libs/framework-virtualization/src/android/system/virtualmachine/VirtualMachineConfig.java
@@ -621,8 +621,8 @@ && this.mVmOutputCaptured == other.mVmOutputCaptured && this.mVmConsoleInputSupported == other.mVmConsoleInputSupported && this.mConnectVmConsole == other.mConnectVmConsole - && this.mConsoleInputDevice == other.mConsoleInputDevice && (this.mVendorDiskImage == null) == (other.mVendorDiskImage == null) + && Objects.equals(this.mConsoleInputDevice, other.mConsoleInputDevice) && Objects.equals(this.mPayloadConfigPath, other.mPayloadConfigPath) && Objects.equals(this.mPayloadBinaryName, other.mPayloadBinaryName) && Objects.equals(this.mPackageName, other.mPackageName)