commit 685b7f70a3c47f5b192e3f7478f0cd289ea6bbf8
author gitbuildkicker <android-build@google.com> Mon Mar 27 11:10:15 2017 -0700
committer gitbuildkicker <android-build@google.com> Mon Mar 27 11:10:15 2017 -0700
tree 6b6d4e943b45ff7e8d4ffa58e24f638016b7ae05
parent 4e3e5fd9d4220bf3b3ac451fe5dead5d42f21d1c
parent e6e89f99d2d254be117eaea7d1eeaf68934ef734

merge in nyc-mr2-release history after reset to nyc-mr2-dev

libcutils/sched_policy.c

diff --git a/libcutils/sched_policy.c b/libcutils/sched_policy.c
index 6d90589..05a2048 100644
--- a/libcutils/sched_policy.c
+++ b/libcutils/sched_policy.c
@@ -404,7 +404,7 @@
         }
 
 
-        if (fd > 0 && add_tid_to_cgroup(tid, fd) != 0) {
+        if (add_tid_to_cgroup(tid, fd) != 0) {
             if (errno != ESRCH && errno != ENOENT)
                 return -errno;
         }

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index 7dc9e55..df60f65 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -145,6 +145,15 @@
     write /dev/cpuctl/cpu.rt_period_us 1000000
     write /dev/cpuctl/cpu.rt_runtime_us 950000
 
+    mkdir /dev/cpuctl/bg_non_interactive
+    chown system system /dev/cpuctl/bg_non_interactive/tasks
+    chmod 0666 /dev/cpuctl/bg_non_interactive/tasks
+    # 5.0 %
+    write /dev/cpuctl/bg_non_interactive/cpu.shares 52
+    write /dev/cpuctl/bg_non_interactive/cpu.rt_period_us 1000000
+    # active FIFO threads will never be in BG
+    write /dev/cpuctl/bg_non_interactive/cpu.rt_runtime_us 10000
+
     # sets up initial cpusets for ActivityManager
     mkdir /dev/cpuset
     mount cpuset none /dev/cpuset