Merge "Make sure path is not NULL to avoid fatal exception." am: e0e5bfeb3c

am: de629f105e

* commit 'de629f105e12122ba042a8ae86b2130ef9a608bb':
  Make sure path is not NULL to avoid fatal exception.
This commit is contained in:
Jeff Sharkey 2015-12-03 17:46:20 +00:00 committed by android-build-merger
commit 9e807ea6db

View file

@ -283,8 +283,8 @@ void VolumeManager::handleBlockEvent(NetlinkEvent *evt) {
evt->dump();
}
std::string eventPath(evt->findParam("DEVPATH"));
std::string devType(evt->findParam("DEVTYPE"));
std::string eventPath(evt->findParam("DEVPATH")?evt->findParam("DEVPATH"):"");
std::string devType(evt->findParam("DEVTYPE")?evt->findParam("DEVTYPE"):"");
if (devType != "disk") return;