Merge "make shutdown safe for double calls."

This commit is contained in:
Treehugger Robot 2017-03-15 02:39:50 +00:00 committed by Gerrit Code Review
commit 71fa1068de

View file

@ -633,8 +633,13 @@ int VolumeManager::reset() {
return 0;
}
// Can be called twice (sequentially) during shutdown. should be safe for that.
int VolumeManager::shutdown() {
if (mInternalEmulated == nullptr) {
return 0; // already shutdown
}
mInternalEmulated->destroy();
mInternalEmulated = nullptr;
for (const auto& disk : mDisks) {
disk->destroy();
}