diff --git a/VolumeManager.cpp b/VolumeManager.cpp index 2c39240..a6bed03 100644 --- a/VolumeManager.cpp +++ b/VolumeManager.cpp @@ -365,7 +365,10 @@ std::shared_ptr VolumeManager::findDisk(const std::string& } std::shared_ptr VolumeManager::findVolume(const std::string& id) { - if (mInternalEmulated->getId() == id) { + // Vold could receive "mount" after "shutdown" command in the extreme case. + // If this happens, mInternalEmulated will equal nullptr and + // we need to deal with it in order to avoid null pointer crash. + if (mInternalEmulated != nullptr && mInternalEmulated->getId() == id) { return mInternalEmulated; } for (const auto& disk : mDisks) { @@ -623,8 +626,10 @@ next: int VolumeManager::reset() { // Tear down all existing disks/volumes and start from a blank slate so // newly connected framework hears all events. - mInternalEmulated->destroy(); - mInternalEmulated->create(); + if (mInternalEmulated != nullptr) { + mInternalEmulated->destroy(); + mInternalEmulated->create(); + } for (const auto& disk : mDisks) { disk->destroy(); disk->create();