diff options
| author | Steve Kondik <steve@cyngn.com> | 2016-03-10 19:48:40 -0800 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-03-11 12:20:26 -0800 |
| commit | 81fba043fafba2576ba3ce7a087347b79e162260 (patch) | |
| tree | 39a7d471e2d72248c4701a24b47670d4ad6ea746 /rootdir | |
| parent | 36060ddbd0fa003c808218fa62afbcb65a5f0878 (diff) | |
| parent | b84295d027c9d86720d93e19eb5c1b644553d647 (diff) | |
| download | system_core-81fba043fafba2576ba3ce7a087347b79e162260.zip system_core-81fba043fafba2576ba3ce7a087347b79e162260.tar.gz system_core-81fba043fafba2576ba3ce7a087347b79e162260.tar.bz2 | |
Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/system/core into cm-13.0
Android 6.0.1 release 22
Change-Id: Ia61f8e863f7413a67fe65f41ea2a30c086528df4
Diffstat (limited to 'rootdir')
| -rw-r--r-- | rootdir/init.rc | 13 | ||||
| -rw-r--r-- | rootdir/init.trace.rc | 2 |
2 files changed, 12 insertions, 3 deletions
diff --git a/rootdir/init.rc b/rootdir/init.rc index 5c6b606..78adacc 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -21,6 +21,8 @@ on early-init # Set the security context of /adb_keys if present. restorecon /adb_keys + mount debugfs /sys/kernel/debug /sys/kernel/debug mode=755 + start ueventd on init @@ -169,13 +171,19 @@ on init chown system system /dev/cpuset/foreground chown system system /dev/cpuset/foreground/boost chown system system /dev/cpuset/background + chown system system /dev/cpuset/system-background chown system system /dev/cpuset/tasks chown system system /dev/cpuset/foreground/tasks chown system system /dev/cpuset/foreground/boost/tasks chown system system /dev/cpuset/background/tasks + chown system system /dev/cpuset/system-background/tasks + + # set system-background to 0775 so SurfaceFlinger can touch it + chmod 0775 /dev/cpuset/system-background chmod 0664 /dev/cpuset/foreground/tasks chmod 0664 /dev/cpuset/foreground/boost/tasks chmod 0664 /dev/cpuset/background/tasks + chmod 0664 /dev/cpuset/system-background/tasks chmod 0664 /dev/cpuset/tasks @@ -653,7 +661,6 @@ service surfaceflinger /system/bin/surfaceflinger user system group graphics drmrpc onrestart restart zygote - writepid /dev/cpuset/system-background/tasks service drm /system/bin/drmserver class main @@ -759,10 +766,10 @@ on property:persist.logd.logpersistd=logcatd # all exec/services are called with umask(077), so no gain beyond 0700 mkdir /data/misc/logd 0700 logd log # logd for write to /data/misc/logd, log group for read from pstore (-L) - exec - logd log -- /system/bin/logcat -L -b all -v threadtime -v usec -v printable -D -f /data/misc/logd/logcat -r 64 -n 256 + exec - logd log -- /system/bin/logcat -L -b all -v threadtime -v usec -v printable -D -f /data/misc/logd/logcat -r 1024 -n 256 start logcatd -service logcatd /system/bin/logcat -b all -v threadtime -v usec -v printable -D -f /data/misc/logd/logcat -r 64 -n 256 +service logcatd /system/bin/logcat -b all -v threadtime -v usec -v printable -D -f /data/misc/logd/logcat -r 1024 -n 256 class late_start disabled # logd for write to /data/misc/logd, log group for read from log daemon diff --git a/rootdir/init.trace.rc b/rootdir/init.trace.rc index 50944e6..4933156 100644 --- a/rootdir/init.trace.rc +++ b/rootdir/init.trace.rc @@ -12,6 +12,7 @@ on boot chown root shell /sys/kernel/debug/tracing/options/print-tgid chown root shell /sys/kernel/debug/tracing/events/sched/sched_switch/enable chown root shell /sys/kernel/debug/tracing/events/sched/sched_wakeup/enable + chown root shell /sys/kernel/debug/tracing/events/sched/sched_blocked_reason/enable chown root shell /sys/kernel/debug/tracing/events/power/cpu_frequency/enable chown root shell /sys/kernel/debug/tracing/events/power/cpu_idle/enable chown root shell /sys/kernel/debug/tracing/events/power/clock_set_rate/enable @@ -24,6 +25,7 @@ on boot chmod 0664 /sys/kernel/debug/tracing/options/print-tgid chmod 0664 /sys/kernel/debug/tracing/events/sched/sched_switch/enable chmod 0664 /sys/kernel/debug/tracing/events/sched/sched_wakeup/enable + chmod 0664 /sys/kernel/debug/tracing/events/sched/sched_blocked_reason/enable chmod 0664 /sys/kernel/debug/tracing/events/power/cpu_frequency/enable chmod 0664 /sys/kernel/debug/tracing/events/power/cpu_idle/enable chmod 0664 /sys/kernel/debug/tracing/events/power/clock_set_rate/enable |