commit 2a8605b9d16d822972b37b267fa11e3e9b9d5636
author Keun-young Park <keunyoung@google.com> Wed Mar 15 02:52:10 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Mar 15 02:52:10 2017 +0000
tree 10f1ce0f4e044bb8645f006151db2bea69e60436
parent b169603d95408f905e2029e4e8324cf256fe6ead
parent 2f93c657f41ffdf6b758c74080bbb0d81decf8b7

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

Change-Id: I78962b7272ef0c39a133db042f36684fc1324018

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();
     }