gugelfrei
/
android_system_vold
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Follow NetlinkEvent refactoring."

Browse Source
gugelfrei
Jeff Sharkey 9 years ago committed by Android (Google) Code Review
parent 6f90ce0f8a 2e0b4a2c54
commit 9e02365a9f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File

8
DirectVolume.cpp
Unescape View File

@ -136,10 +136,10 @@ int DirectVolume::handleBlockEvent(NetlinkEvent *evt) {
for (it = mPaths->begin(); it != mPaths->end(); ++it) { for (it = mPaths->begin(); it != mPaths->end(); ++it) {
if ((*it)->match(dp)) { if ((*it)->match(dp)) {
/* We can handle this disk */ /* We can handle this disk */
int action = evt->getAction(); NetlinkEvent::Action action = evt->getAction();
const char *devtype = evt->findParam("DEVTYPE"); const char *devtype = evt->findParam("DEVTYPE");
if (action == NetlinkEvent::NlActionAdd) { if (action == NetlinkEvent::Action::kAdd) {
int major = atoi(evt->findParam("MAJOR")); int major = atoi(evt->findParam("MAJOR"));
int minor = atoi(evt->findParam("MINOR")); int minor = atoi(evt->findParam("MINOR"));
char nodepath[255]; char nodepath[255];
@ -166,13 +166,13 @@ int DirectVolume::handleBlockEvent(NetlinkEvent *evt) {
mVm->getBroadcaster()->sendBroadcast(ResponseCode::VolumeDiskInserted, mVm->getBroadcaster()->sendBroadcast(ResponseCode::VolumeDiskInserted,
msg, false); msg, false);
} }
} else if (action == NetlinkEvent::NlActionRemove) { } else if (action == NetlinkEvent::Action::kRemove) {
if (!strcmp(devtype, "disk")) { if (!strcmp(devtype, "disk")) {
handleDiskRemoved(dp, evt); handleDiskRemoved(dp, evt);
} else { } else {
handlePartitionRemoved(dp, evt); handlePartitionRemoved(dp, evt);
} }
} else if (action == NetlinkEvent::NlActionChange) { } else if (action == NetlinkEvent::Action::kChange) {
if (!strcmp(devtype, "disk")) { if (!strcmp(devtype, "disk")) {
handleDiskChanged(dp, evt); handleDiskChanged(dp, evt);
} else { } else {

Write Preview
Loading…
Cancel
Save