commit afca0f576244cc0a2f724936fa71d7829018fc72
author Jaesoo Lee <jaesoo@google.com> Wed Apr 12 22:58:17 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 12 22:58:18 2017 +0000
tree 59a171f15710a885e3082b4057c8d4a2199e8aa0
parent 31656d4dd6ff2ef06dbcb58cb722fb1f8e0eaf12
parent 3a462a72a83c68bbbb304c9299a8f2ca5904b50b

Merge "disable module loading after BOOT_COMPLETED broadcast" into oc-dev

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index 6a01baf..0b3e3ee 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -645,6 +645,12 @@
 on property:sys.boot_completed=1
     bootchart stop
 
+on property:sys.boot_completed=1 && property:ro.build.type=user
+    write /proc/sys/kernel/modules_disabled 1
+
+on property:sys.boot_completed=1 && property:ro.build.type=userdebug
+    write /proc/sys/kernel/modules_disabled 1
+
 # system server cannot write to /proc/sys files,
 # and chown/chmod does not work for /proc/sys/ entries.
 # So proxy writes through init.