Merge tag 'android-6.0.1_r61' into HEAD

Android 6.0.1 Release 61 (MOB30Z) Change-Id: I84413f1198957a53433955e617a7226639262f40
zhxt · Aug 2, 2016 · 4a978c6 · 4a978c6
2 parents 4123d86 + 671d62d
commit 4a978c6
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/rootdir/init.rc b/rootdir/init.rc
@@ -559,6 +559,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.
 ##