diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-05-08 15:13:22 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-05-08 15:13:22 -0700 |
| commit | 7bffd4486dff76d61c45aa53a33be48ec50ae8b1 (patch) | |
| tree | 7ca87c2e3dc701acd4978a8572eb7ad2efa7b4a3 | |
| parent | af05ec0e5e99f9a91c7b7d731a8ef34f87976948 (diff) | |
| parent | 0e110bb5a2559b60003effa0e0bf460993e634a6 (diff) | |
| download | system_vold-7bffd4486dff76d61c45aa53a33be48ec50ae8b1.zip system_vold-7bffd4486dff76d61c45aa53a33be48ec50ae8b1.tar.gz system_vold-7bffd4486dff76d61c45aa53a33be48ec50ae8b1.tar.bz2 | |
am 0e110bb5: am 5cf6325c: Merge "Unshare ums when SD card is removed"
* commit '0e110bb5a2559b60003effa0e0bf460993e634a6':
Unshare ums when SD card is removed
| -rw-r--r-- | DirectVolume.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/DirectVolume.cpp b/DirectVolume.cpp index 4acee76..c745c93 100644 --- a/DirectVolume.cpp +++ b/DirectVolume.cpp @@ -275,6 +275,11 @@ void DirectVolume::handleDiskRemoved(const char *devpath, NetlinkEvent *evt) { 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)", |