commit 9e02365a9f3937cab133f63aaeca331e0ef423ca
author Jeff Sharkey <jsharkey@android.com> Fri Mar 13 20:47:50 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 13 20:47:51 2015 +0000
tree abe59cf215f8df949e9b05693e723f5a95844f7c
parent 6f90ce0f8afeff4305e0f6e70e1561b327cb3022
parent 2e0b4a2c54479aa7fcd37bb8379efb6d3de308ff

Merge "Follow NetlinkEvent refactoring."

DirectVolume.cpp

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