commit 4f7cd9cbff2bb7454d5ce25c51b40b2bf3b102c0
author Paul Lawrence <paullawrence@google.com> Fri May 22 19:28:49 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri May 22 19:28:49 2015 +0000
tree 6029a88a7540e75b4b4cc260cd986d2908e1d1ab
parent fc5f18bb4a9f31ba0d97a984bbbe3e681a105a77
parent 605724e6c4117102d7bd342bb2a6f6bf80a9bcb1

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

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

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index 436465a..9fe1b4f 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -265,7 +265,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
@@ -315,9 +314,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