summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2013-10-01 18:53:51 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-10-01 18:53:51 -0700
commit0d3ac55d0654fe4f6d37923782dcd41f0590c741 (patch)
tree8a40e6b9e892e971bac53bb78a1d01725681b8e8
parent9293ea4c8650a2907772f684a7c9415f82414539 (diff)
parent230252d5cd70f5be4c24046c7a409e9498ac97f5 (diff)
downloadsystem_core-0d3ac55d0654fe4f6d37923782dcd41f0590c741.zip
system_core-0d3ac55d0654fe4f6d37923782dcd41f0590c741.tar.gz
system_core-0d3ac55d0654fe4f6d37923782dcd41f0590c741.tar.bz2
am 230252d5: am 61afb07b: Merge "Trigger a policy reload from post-fs-data."
* commit '230252d5cd70f5be4c24046c7a409e9498ac97f5': Trigger a policy reload from post-fs-data.
-rw-r--r--rootdir/init.rc3
1 files changed, 3 insertions, 0 deletions
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 @@ on post-fs-data
# 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.