pa-fazil
/
android_packages_modules_Virtualization
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Unlink death of VS once the VM has died 

Once the VM has died, we're not interested whether VS dies. This also
cleans up the logs about leaked death recipients that, while mostly
harmless, have been distracting diversions.

Test: atest MicrodroidTest
Change-Id: I64d623ca749e1d261261418d0cecae0e40e33b3d
This commit is contained in:
Andrew Scull 2022-02-21 17:30:32 +00:00
parent e35c3fe303
commit c60a7bd937
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
javalib/src/android/system/virtualmachine/VirtualMachine.java
View File

@ -376,6 +376,18 @@ public class VirtualMachine {
android.system.virtualizationservice.VirtualMachineConfig vmConfigParcel =
android.system.virtualizationservice.VirtualMachineConfig.appConfig(appConfig);
IBinder.DeathRecipient deathRecipient = new IBinder.DeathRecipient() {
@Override
public void binderDied() {
final VirtualMachineCallback cb = mCallback;
if (cb != null) {
// TODO(b/220730550): don't call if the VM already died
cb.onDied(VirtualMachine.this, VirtualMachineCallback
.DEATH_REASON_VIRTUALIZATIONSERVICE_DIED);
}
}
};
mVirtualMachine = service.createVm(vmConfigParcel, mConsoleWriter, mLogWriter);
mVirtualMachine.registerCallback(
new IVirtualMachineCallback.Stub() {
@ -441,6 +453,7 @@ public class VirtualMachine {
@Override
public void onDied(int cid, int reason) {
service.asBinder().unlinkToDeath(deathRecipient, 0);
final VirtualMachineCallback cb = mCallback;
if (cb == null) {
return;
@ -454,19 +467,7 @@ public class VirtualMachine {
}
}
});
service.asBinder()
.linkToDeath(
new IBinder.DeathRecipient() {
@Override
public void binderDied() {
final VirtualMachineCallback cb = mCallback;
if (cb != null) {
cb.onDied(VirtualMachine.this, VirtualMachineCallback
.DEATH_REASON_VIRTUALIZATIONSERVICE_DIED);
}
}
},
0);
service.asBinder().linkToDeath(deathRecipient, 0);
mVirtualMachine.start();
} catch (IOException e) {
throw new VirtualMachineException(e);