commit 886b8dfa12a47ff211631a98d340d8c2f845c090
author Daniel Micay <danielmicay@gmail.com> Wed Jun 01 23:47:44 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jun 01 23:47:44 2016 +0000
tree aafac35ed34ea5855c015b1a23059547643bb616
parent f55c505e857e5b6861d39af14f2100b8c9103814
parent ad96a1faad6bb1506051b92e4da02d410057e16a

Merge "add a property for controlling perf_event_paranoid" am: 9292d7dae3 am: a6d6f45037
am: 680b2f3cb6

* commit '680b2f3cb61e29a46d0d6bdf89394dd96e82f201':
  add a property for controlling perf_event_paranoid

Change-Id: I23b928d61d2fa81637aefa09c34bf0e20777ad55

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index 9344f36..7b24dd3 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -596,6 +596,11 @@
 on property:sys.sysctl.tcp_def_init_rwnd=*
     write /proc/sys/net/ipv4/tcp_default_init_rwnd ${sys.sysctl.tcp_def_init_rwnd}
 
+on property:security.perf_harden=0
+    write /proc/sys/kernel/perf_event_paranoid 1
+
+on property:security.perf_harden=1
+    write /proc/sys/kernel/perf_event_paranoid 3
 
 ## Daemon processes to be run by init.
 ##