commit 01d445d0c2e6c01ada8096bd83ca604d145a7ce2
author Jaesoo Lee <jaesoo@google.com> Wed Apr 12 23:13:19 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Apr 12 23:13:19 2017 +0000
tree 27283d1ab8850021ea91e78dd282a0228b9a04ab
parent 2d312115d2800cd941d25e60cb1d984f50a86c4d
parent 979e5436dcb1aea8c0253719f2c51a2ebce37954

Merge "disable module loading after BOOT_COMPLETED broadcast" am: 20b7f78204
am: 65c8cb8935

Change-Id: I40a636fba58a0ccaeeeaab3510229dfebf0925a9

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index 3758362..17dade4 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -644,6 +644,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.