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

am: 2f93c657f4

Change-Id: I78962b7272ef0c39a133db042f36684fc1324018

VolumeManager.cpp

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