Merge "mInternalEmulated could be used after shutdown() called" am: 9b4a443bd6 am: 92052aa582
am: 1b6d8237f2
Change-Id: I71b1ec275e2850c1a8273ac5eebc7373a0729552
diff --git a/VolumeManager.cpp b/VolumeManager.cpp
index 8398498..13a943f 100644
--- a/VolumeManager.cpp
+++ b/VolumeManager.cpp
@@ -425,7 +425,10 @@
}
std::shared_ptr<android::vold::VolumeBase> 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) {
@@ -689,8 +692,10 @@
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();