| commit | 3b3c368eb9622c106eb758f795ab0932c04921e6 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Wed Dec 11 04:17:36 2024 -0800 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Dec 11 04:17:36 2024 -0800 |
| tree | 2e293b93e2f1cc8cfe13045633c441b4c3ef9811 | |
| parent | 119fba65035851044d9ae2832de56e74e3128728 [diff] | |
| parent | 14b982d3b10b3bbd882f33b8dbd1d91a993831ad [diff] |
Merge "Don't re-create VM instance if the config is compatible" into main am: 6627bfaeb0 am: 14b982d3b1 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3405220 Change-Id: I2443c0e79de1374fc53a77b574987683ac1eabfc 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)