commit 9ff60ff8d68cd3c1800dcdb1a990e74018f45e4b
author Paul Lawrence <paullawrence@google.com> Fri May 22 19:41:48 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri May 22 19:41:48 2015 +0000
tree 0b150f0a2fb92e97d5bf8be111f7aeb0e372480d
parent 537e2ecea7d34571417fed537f9018870b1161f5
parent 4f7cd9cbff2bb7454d5ce25c51b40b2bf3b102c0

am f0b318d6: am 7c789575: Merge "Revert "Set up crypto for user directories in init.""

* commit 'f0b318d61cc129f4ddd25859500857b9f8e34e69':
  Revert "Set up crypto for user directories in init."

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index c220ee5..0a33c70 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -270,7 +270,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
@@ -320,9 +319,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