commit da9eed1c80bb278f0a916e9a769dafbc3be38be3
author Jeff Sharkey <jsharkey@android.com> Thu Aug 23 14:15:00 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Aug 23 14:15:00 2012 -0700
tree 0c5089ae189a34edecc932817b74fe3639acd45b
parent 225590c05a304358d34cfffcdb408560fb4410cc
parent 7382f81fba895f1ac970ac2fad875f35836b8082

am 7382f81f: Unmount external storage on multi-user devices.

* commit '7382f81fba895f1ac970ac2fad875f35836b8082':
  Unmount external storage on multi-user devices.

cryptfs.c

diff --git a/cryptfs.c b/cryptfs.c
index cebe625..b66f1ac 100644
--- a/cryptfs.c
+++ b/cryptfs.c
@@ -1179,11 +1179,14 @@
     snprintf(lockid, sizeof(lockid), "enablecrypto%d", (int) getpid());
     acquire_wake_lock(PARTIAL_WAKE_LOCK, lockid);
 
-     /* Get the sdcard mount point */
-     sd_mnt_point = getenv("EXTERNAL_STORAGE");
-     if (! sd_mnt_point) {
-         sd_mnt_point = "/mnt/sdcard";
-     }
+    /* Get the sdcard mount point */
+    sd_mnt_point = getenv("MULTIUSER_EXTERNAL_STORAGE");
+    if (!sd_mnt_point) {
+       sd_mnt_point = getenv("EXTERNAL_STORAGE");
+    }
+    if (!sd_mnt_point) {
+        sd_mnt_point = "/mnt/sdcard";
+    }
 
     num_vols=vold_getNumDirectVolumes();
     vol_list = malloc(sizeof(struct volume_info) * num_vols);