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

am: a6d6f45037

* commit 'a6d6f45037025175b3074661c9d2d80931d71817':
  add a property for controlling perf_event_paranoid

Change-Id: Ic1e1a1365735f73edde6767bf71da8c6e59b46a4
This commit is contained in:
Jeffrey Vander Stoep 2016-06-01 23:33:12 +00:00 committed by android-build-merger
commit 680b2f3cb6
1 changed files with 5 additions and 0 deletions

View File

@ -596,6 +596,11 @@ on property:sys.sysctl.extra_free_kbytes=*
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.
##