commit 0c44afbcce8188d5d0d287676f4416c9053b753a
author Paul Crowley <paulcrowley@google.com> Thu May 21 21:59:40 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu May 21 21:59:40 2015 +0000
tree f524fe07059540b2cf1bb29b75cffa0aa58b3229
parent 50e0f04c36add4bbfc4f43688bf964596a4ec18b
parent 3e53674d455ded24c9dd321cafe9bb2350bd20d4

am 5f3c715e: am 7f623dec: Merge "Set up crypto for user directories in init."

* commit '5f3c715e1a8331f13ea39264b24dfc03ac8db060':
  Set up crypto for user directories in init.

rootdir/init.rc

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