commit 457197c50056216c1552e020998274a3bb249dd9
author Kenny Root <kroot@google.com> Thu May 10 16:46:37 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu May 10 16:46:37 2012 -0700
tree 37e148e0ab176354898851020e5ac76af4c4ad13
parent 0e110bb5a2559b60003effa0e0bf460993e634a6
parent 348c8aba0d2df2996e0fe57900ef518c6aeb4b29

am 348c8aba: Only set permissions on dirs or files

* commit '348c8aba0d2df2996e0fe57900ef518c6aeb4b29':
  Only set permissions on dirs or files

DirectVolume.cpp

diff --git a/DirectVolume.cpp b/DirectVolume.cpp
index 4acee76..c745c93 100644
--- a/DirectVolume.cpp
+++ b/DirectVolume.cpp
@@ -275,6 +275,11 @@
     int major = atoi(evt->findParam("MAJOR"));
     int minor = atoi(evt->findParam("MINOR"));
     char msg[255];
+    bool enabled;
+
+    if (mVm->shareEnabled(getLabel(), "ums", &enabled) == 0 && enabled) {
+        mVm->unshareVolume(getLabel(), "ums");
+    }
 
     SLOGD("Volume %s %s disk %d:%d removed\n", getLabel(), getMountpoint(), major, minor);
     snprintf(msg, sizeof(msg), "Volume %s %s disk removed (%d:%d)",