commit 0d3ac55d0654fe4f6d37923782dcd41f0590c741
author Colin Cross <ccross@android.com> Tue Oct 01 18:53:51 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Oct 01 18:53:51 2013 -0700
tree 8a40e6b9e892e971bac53bb78a1d01725681b8e8
parent 9293ea4c8650a2907772f684a7c9415f82414539
parent 230252d5cd70f5be4c24046c7a409e9498ac97f5

am 230252d5: am 61afb07b: Merge "Trigger a policy reload from post-fs-data."

* commit '230252d5cd70f5be4c24046c7a409e9498ac97f5':
  Trigger a policy reload from post-fs-data.

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index b13cf62..4dd0124 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -255,6 +255,9 @@
     # Separate location for storing security policy files on data
     mkdir /data/security 0711 system system
 
+    # Reload policy from /data/security if present.
+    setprop selinux.reload_policy 1
+
     # If there is no fs-post-data action in the init.<device>.rc file, you
     # must uncomment this line, otherwise encrypted filesystems
     # won't work.