summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@cyngn.com>2016-08-02 11:12:41 -0700
committerJessica Wagantall <jwagantall@cyngn.com>2016-08-02 11:37:51 -0700
commit4a978c61eeac87e1e39d363bd113962e2b9caa5c (patch)
tree0f740641bbca73d59aef907f18dfd1cef09a40e9
parent4123d86b8059d13c888702e58351469c5d176ecf (diff)
parent671d62d73c9c643159107ca77721b6540ef79eea (diff)
downloadsystem_core-4a978c61eeac87e1e39d363bd113962e2b9caa5c.zip
system_core-4a978c61eeac87e1e39d363bd113962e2b9caa5c.tar.gz
system_core-4a978c61eeac87e1e39d363bd113962e2b9caa5c.tar.bz2
Merge tag 'android-6.0.1_r61' into HEAD
Android 6.0.1 Release 61 (MOB30Z) Change-Id: I84413f1198957a53433955e617a7226639262f40
-rw-r--r--rootdir/init.rc5
1 files changed, 5 insertions, 0 deletions
diff --git a/rootdir/init.rc b/rootdir/init.rc
index ec5a2f6..1c6fca6 100644
--- 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.
##