diff options
author | Jeff Sharkey <jsharkey@android.com> | 2012-08-23 14:08:59 -0700 |
---|---|---|
committer | The Android Automerger <android-build@android.com> | 2012-08-23 14:22:27 -0700 |
commit | e270d6c1b5c9095a07910560734a7d40e133689b (patch) | |
tree | 0c5089ae189a34edecc932817b74fe3639acd45b | |
parent | 4fe053e1b406b41b5a60707523b389530619d953 (diff) | |
download | system_vold-e270d6c1b5c9095a07910560734a7d40e133689b.zip system_vold-e270d6c1b5c9095a07910560734a7d40e133689b.tar.gz system_vold-e270d6c1b5c9095a07910560734a7d40e133689b.tar.bz2 |
Unmount external storage on multi-user devices.
Bug: 7044670
Change-Id: If1f99968b0392cae9420d067c75bfc18d1067b2c
-rw-r--r-- | cryptfs.c | 13 |
1 files changed, 8 insertions, 5 deletions
@@ -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); |