commit bac5eb966c5c3aa9abe83cdb5187326f422741ab
author Jean-Baptiste Queru <jbq@google.com> Tue May 22 07:25:51 2012 -0700
committer android code review <noreply-gerritcodereview@google.com> Tue May 22 07:25:52 2012 -0700
tree 4bdebdcc5009bd073d00d9cf86107e22955e5ac6
parent 5cf6325c91792dbb1bb08fa1958c1fc8a5b9c45d
parent 3dafc26e4f3adb9607e82ab0bd52ead5f76859a1

Merge "Delay disk inserted broadcast until disk is ready"

DirectVolume.cpp

diff --git a/DirectVolume.cpp b/DirectVolume.cpp
index 9a064e7..2a24376 100644
--- a/DirectVolume.cpp
+++ b/DirectVolume.cpp
@@ -278,6 +278,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)",