summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Kralevich2014-01-18 17:28:11 -0600
committerNick Kralevich2014-03-04 13:14:34 -0600
commit6941a83c2dd34df606df13972576fbc23172c3c5 (patch)
treee7229e35575e35109ffc458f7b3fc0ba0d0eb8a8
parent02916aa20e3ffbe4b738bb12dc1607a7ec6a8c37 (diff)
downloadplatform-system-core-6941a83c2dd34df606df13972576fbc23172c3c5.tar.gz
platform-system-core-6941a83c2dd34df606df13972576fbc23172c3c5.tar.xz
platform-system-core-6941a83c2dd34df606df13972576fbc23172c3c5.zip
don't load property_contexts from /data
Bug: 12613118 Change-Id: I5a84b13d2151075d5136e3682431fbcc9307df13 (cherry picked from commit dc3a42bb11dc2aefee37f799b5a1cce87cf35aaf)
-rw-r--r--init/init.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/init/init.c b/init/init.c
index 94a201196..bd7799e18 100644
--- a/init/init.c
+++ b/init/init.c
@@ -843,7 +843,6 @@ static int bootchart_init_action(int nargs, char **args)
843#endif 843#endif
844 844
845static const struct selinux_opt seopts_prop[] = { 845static const struct selinux_opt seopts_prop[] = {
846 { SELABEL_OPT_PATH, "/data/security/property_contexts" },
847 { SELABEL_OPT_PATH, "/property_contexts" }, 846 { SELABEL_OPT_PATH, "/property_contexts" },
848 { 0, NULL } 847 { 0, NULL }
849}; 848};