Snap for 7808903 from ecaf9ef to sc-qpr1-d-release

Change-Id: I2ef0b303a9d1e9ad5e12ae63b88504b2beb5495c

Author: Android Build Coastguard Worker

libprocessgroup/profiles/task_profiles_28.json

@@ -39,6 +39,19 @@
         }
       ]
     },
+    {
+      "Name": "ServicePerformance",
+      "Actions": [
+        {
+          "Name": "JoinCgroup",
+          "Params":
+          {
+            "Controller": "schedtune",
+            "Path": "background"
+          }
+        }
+      ]
+    },
     {
       "Name": "HighPerformance",
       "Actions": [

libprocessgroup/profiles/task_profiles_29.json

@@ -52,6 +52,19 @@
         }
       ]
     },
+    {
+      "Name": "ServicePerformance",
+      "Actions": [
+        {
+          "Name": "JoinCgroup",
+          "Params":
+          {
+            "Controller": "schedtune",
+            "Path": "background"
+          }
+        }
+      ]
+    },
     {
       "Name": "MaxPerformance",
       "Actions": [

libprocessgroup/profiles/task_profiles_30.json

@@ -39,6 +39,19 @@
         }
       ]
     },
+    {
+      "Name": "ServicePerformance",
+      "Actions": [
+        {
+          "Name": "JoinCgroup",
+          "Params":
+          {
+            "Controller": "schedtune",
+            "Path": "background"
+          }
+        }
+      ]
+    },
     {
       "Name": "HighPerformance",
       "Actions": [

libutils/Threads.cpp

@@ -86,8 +86,10 @@ struct thread_data_t {
 
         // A new thread will be in its parent's sched group by default,
         // so we just need to handle the background case.
+        // currently set to system_background group which is different
+        // from background group for app.
         if (prio >= ANDROID_PRIORITY_BACKGROUND) {
-            SetTaskProfiles(0, {"SCHED_SP_BACKGROUND"}, true);
+            SetTaskProfiles(0, {"SCHED_SP_SYSTEM"}, true);
         }
 
         if (name) {
@@ -313,7 +315,7 @@ int androidSetThreadPriority(pid_t tid, int pri)
     }
 
     if (pri >= ANDROID_PRIORITY_BACKGROUND) {
-        rc = SetTaskProfiles(tid, {"SCHED_SP_BACKGROUND"}, true) ? 0 : -1;
+        rc = SetTaskProfiles(tid, {"SCHED_SP_SYSTEM"}, true) ? 0 : -1;
     } else if (curr_pri >= ANDROID_PRIORITY_BACKGROUND) {
         SchedPolicy policy = SP_FOREGROUND;
         // Change to the sched policy group of the process.

rootdir/init.rc

@@ -590,20 +590,7 @@ on late-fs
     # Load trusted keys from dm-verity protected partitions
     exec -- /system/bin/fsverity_init --load-verified-keys
 
-# Only enable the bootreceiver tracing instance for kernels 5.10 and above.
-on late-fs && property:ro.kernel.version=4.9
-    setprop bootreceiver.enable 0
-on late-fs && property:ro.kernel.version=4.14
-    setprop bootreceiver.enable 0
-on late-fs && property:ro.kernel.version=4.19
-    setprop bootreceiver.enable 0
-on late-fs && property:ro.kernel.version=5.4
-    setprop bootreceiver.enable 0
-on late-fs
-    # Bootreceiver tracing instance is enabled by default.
-    setprop bootreceiver.enable ${bootreceiver.enable:-1}
-
-on property:ro.product.cpu.abilist64=* && property:bootreceiver.enable=1
+on late-fs && property:ro.product.cpu.abilist64=*
     # Set up a tracing instance for system_server to monitor error_report_end events.
     # These are sent by kernel tools like KASAN and KFENCE when a memory corruption
     # is detected. This is only needed for 64-bit systems.