commit b8cc34e024567757ebddc5839d1de25bc151ae0d
author Jaesoo Lee <jaesoo@google.com> Wed Apr 12 23:09:04 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Apr 12 23:09:04 2017 +0000
tree 48741ef99fb95888a7ddba78d212b0bff9499370
parent e717ebabc7a048d1e512f1561f9eb3fd4b3a351f
parent afca0f576244cc0a2f724936fa71d7829018fc72

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

Change-Id: I7c750c9838b22cbcd9acb849c10be47ba7a50feb

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.