Remove StubVolume disks upon vold reset events
StubVolumes are managed from outside Android (e.g. from Chrome OS). So,
their disk recreation on vold reset events should also be handled from
outside by 1) listening to reset events, and 2) calling
createStubVolume() for existing StubVolumes on reset events.
Bug: 175281783
Test: m
Test: (Tested in R) Manually induce a vold reset event, and confirm that
Test: 1) vold does not crash, and 2) existing volumes are successfully
Test: mounted again (by calling createStubVolume() for StubVolumes).
Change-Id: I4628eabf809037a547aeef43faedf4dfa57529a6
diff --git a/VolumeManager.cpp b/VolumeManager.cpp
index 02025b7..9311321 100644
--- a/VolumeManager.cpp
+++ b/VolumeManager.cpp
@@ -899,10 +899,21 @@
}
mInternalEmulatedVolumes.clear();
+ // Destroy and recreate all disks except that StubVolume disks are just
+ // destroyed and removed from both mDisks and mPendingDisks.
+ // StubVolumes are managed from outside Android (e.g. from Chrome OS) and
+ // their disk recreation on reset events should be handled from outside by
+ // calling createStubVolume() again.
for (const auto& disk : mDisks) {
disk->destroy();
- disk->create();
+ if (!disk->isStub()) {
+ disk->create();
+ }
}
+ const auto isStub = [](const auto& disk) { return disk->isStub(); };
+ mDisks.remove_if(isStub);
+ mPendingDisks.remove_if(isStub);
+
updateVirtualDisk();
mAddedUsers.clear();
mStartedUsers.clear();