From e270d6c1b5c9095a07910560734a7d40e133689b Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Thu, 23 Aug 2012 14:08:59 -0700 Subject: Unmount external storage on multi-user devices. Bug: 7044670 Change-Id: If1f99968b0392cae9420d067c75bfc18d1067b2c --- cryptfs.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/cryptfs.c b/cryptfs.c index cebe625..b66f1ac 100644 --- a/cryptfs.c +++ b/cryptfs.c @@ -1179,11 +1179,14 @@ int cryptfs_enable(char *howarg, char *passwd) 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); -- cgit v1.1