commit faa0947296da7d5a2f3479803d3cded6606c0d3f
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Mar 21 03:17:11 2025 -0700
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Mar 21 03:17:11 2025 -0700
tree 899bee04d8e844f0b7c6097cfc1498e7ebb2f591
parent ccaa797e848d88a0ea55e2a071a92d7b95d716e2
parent 8e8944104268c924610b37d7bed20eccd340c2bd

Merge "VirtualMachine: Ignore RemoteException when death of VM isn't an issue" into main am: 8e89441042

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3555926

Change-Id: I2465c249d91b8de73d3365080a3d0b8b7f7e6226
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

libs/framework-virtualization/src/android/system/virtualmachine/VirtualMachine.java

diff --git a/libs/framework-virtualization/src/android/system/virtualmachine/VirtualMachine.java b/libs/framework-virtualization/src/android/system/virtualmachine/VirtualMachine.java
index 9641882..3a1fc7a 100644
--- a/libs/framework-virtualization/src/android/system/virtualmachine/VirtualMachine.java
+++ b/libs/framework-virtualization/src/android/system/virtualmachine/VirtualMachine.java
@@ -758,7 +758,7 @@
             try {
                 status = stateToStatus(virtualMachine.getState());
             } catch (RemoteException e) {
-                throw e.rethrowAsRuntimeException();
+                status = STATUS_STOPPED;
             }
         }
         if (status == STATUS_STOPPED && !mVmRootPath.exists()) {
@@ -1890,9 +1890,7 @@
                     mVirtualMachine.stop();
                     dropVm();
                 }
-            } catch (RemoteException e) {
-                throw e.rethrowAsRuntimeException();
-            } catch (ServiceSpecificException e) {
+            } catch (RemoteException | ServiceSpecificException e) {
                 // Deliberately ignored; this almost certainly means the VM exited just as
                 // we tried to stop it.
                 Log.i(TAG, "Ignoring error on close()", e);