commit 1a06edaf4db4e9c520624bcc06e0e13ee470d90e
author San Mehat <san@google.com> Thu Apr 15 12:58:50 2010 -0700
committer San Mehat <san@google.com> Thu Apr 15 12:59:15 2010 -0700
tree 274a062c49efd0f44af1943ed8b7ab51e8211be0
parent 97ac40e4e6f3ed0bd5d6878d7d8d4a54fcaecb76

vold: Ensure we cleanup secure containers on card removal.

Fixes bug: http://b/issue?id=2567572

Note: The framework will still likely restart since the system_server
is holding references to assets on the card which are mmaped, but
at least now storage will be available when a new card is re-inserted.

Change-Id: I4e195c0c666426b93da47198fa826a6f58d855a9
Signed-off-by: San Mehat <san@google.com>

DirectVolume.cpp

diff --git a/DirectVolume.cpp b/DirectVolume.cpp
index c269303..1f9f084 100644
--- a/DirectVolume.cpp
+++ b/DirectVolume.cpp
@@ -284,6 +284,11 @@
                  getLabel(), getMountpoint(), major, minor);
         mVm->getBroadcaster()->sendBroadcast(ResponseCode::VolumeBadRemoval,
                                              msg, false);
+
+	if (mVm->cleanupAsec(this, true)) {
+            SLOGE("Failed to cleanup ASEC - unmount will probably fail!");
+        }
+
         if (Volume::unmountVol(true)) {
             SLOGE("Failed to unmount volume on bad removal (%s)", 
                  strerror(errno));