commit 2f93c657f41ffdf6b758c74080bbb0d81decf8b7
author Keun-young Park <keunyoung@google.com> Wed Mar 15 02:47:09 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Mar 15 02:47:09 2017 +0000
tree 10f1ce0f4e044bb8645f006151db2bea69e60436
parent f53cc1b04a86ca38b46d485de91a619d1fedbe6a
parent 71fa1068de3f3f7b79d262e487ae90f948c415d6

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

Change-Id: I161c96dc5a44890fffe8fcdf9e0f8fc874df29c0

VolumeManager.cpp

diff --git a/VolumeManager.cpp b/VolumeManager.cpp
index 4a649bb..927c660 100644
--- a/VolumeManager.cpp
+++ b/VolumeManager.cpp
@@ -633,8 +633,13 @@
     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();
     }