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
This commit is contained in:
Daniel Micay 2016-06-01 23:47:44 +00:00 committed by android-build-merger
commit 0e7344f1ca
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.
##