am ffdac6dd: am f0b318d6: am 7c789575: Merge "Revert "Set up crypto for user directories in init.""
* commit 'ffdac6ddf2e13370674821159edd9663b5302707':
Revert "Set up crypto for user directories in init."
diff --git a/rootdir/init.rc b/rootdir/init.rc
index 9989a24..4cc8992 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -271,7 +271,6 @@
chmod 0660 /data/misc/wifi/wpa_supplicant.conf
mkdir /data/local 0751 root root
mkdir /data/misc/media 0700 media media
- mkdir /data/misc/vold 0700 root root
# For security reasons, /data/local/tmp should always be empty.
# Do not place files or directories in /data/local/tmp
@@ -321,9 +320,6 @@
mkdir /data/system/heapdump 0700 system system
mkdir /data/user 0711 system system
- # Set up the crypto policies on /data/user
- exec -- /system/bin/vdc cryptfs setusercryptopolicies /data/user
-
# Reload policy from /data/security if present.
setprop selinux.reload_policy 1