commit 3918ae6c76a03db8eb6060914c7cff86649fdc26
author Keun-young Park <keunyoung@google.com> Wed Mar 15 02:56:40 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Mar 15 02:56:40 2017 +0000
tree 1a72193aa718a93f6b95b82fdfb6ffd799adb2a9
parent 3b0a884381c1576f64dfbdda22227a1850331a6c
parent 2a8605b9d16d822972b37b267fa11e3e9b9d5636

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

Change-Id: Id1cd83d307e7791359bc6dfd96368f1138ff21d2

VolumeManager.cpp

diff --git a/VolumeManager.cpp b/VolumeManager.cpp
index 9dc250b..40e3921 100644
--- a/VolumeManager.cpp
+++ b/VolumeManager.cpp
@@ -639,8 +639,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();
     }