tequilaOS/platform_system_vold
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "make shutdown safe for double calls." am: 71fa1068de

Browse source 
am: 2f93c657f4

Change-Id: I78962b7272ef0c39a133db042f36684fc1324018
This commit is contained in:
Keun-young Park 2017-03-15 02:52:10 +00:00 committed by android-build-merger
commit 2a8605b9d1
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
VolumeManager.cpp
View file

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