VirtualMachine: Ignore RemoteException when death of VM isn't an issue
This is a quick fix for the dead object exception when virtmgr dies.
Bug: 396410595
Test: Manually
Change-Id: Iea48bfe389001c0ce6283a1f2267fee5b42c8d4b
diff --git a/libs/framework-virtualization/src/android/system/virtualmachine/VirtualMachine.java b/libs/framework-virtualization/src/android/system/virtualmachine/VirtualMachine.java
index 4f58cd6..0d13695 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);