tequilaOS/platform_system_vold
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "mInternalEmulated could be used after shutdown() called"

Browse source 
am: 9b4a443bd6

Change-Id: Ia1007988297c39f391b35ad51645556ceeaf0cc6
This commit is contained in:
Keun-young Park 2017-08-17 22:13:40 +00:00 committed by android-build-merger
commit 92052aa582
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
VolumeManager.cpp
View file

@ -423,7 +423,10 @@ std::shared_ptr<android::vold::Disk> VolumeManager::findDisk(const std::string&
} }
std::shared_ptr<android::vold::VolumeBase> VolumeManager::findVolume(const std::string& id) { 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; return mInternalEmulated;
} }
for (const auto& disk : mDisks) { for (const auto& disk : mDisks) {
@ -687,8 +690,10 @@ next:
int VolumeManager::reset() { int VolumeManager::reset() {
// Tear down all existing disks/volumes and start from a blank slate so // Tear down all existing disks/volumes and start from a blank slate so
// newly connected framework hears all events. // newly connected framework hears all events.
mInternalEmulated->destroy(); if (mInternalEmulated != nullptr) {
mInternalEmulated->create(); mInternalEmulated->destroy();
mInternalEmulated->create();
}
for (const auto& disk : mDisks) { for (const auto& disk : mDisks) {
disk->destroy(); disk->destroy();
disk->create(); disk->create();