Snap for 7856913 from a978122e4ceb52d167b7d1d0d70a120d290c0696 to tm-release

Change-Id: I8cc2cfa7977bab34d93bd2bdb937c3ab4789a200

conf/init.gs101.rc

@@ -719,12 +719,15 @@ on property:sys.boot_completed=1
     write /sys/kernel/vendor_sched/sys_prefer_idle 0
     # cfs_rq clamp is using tg->uclamp setting
     # align it with the vendor_group setting
-    write /sys/kernel/vendor_sched/bg_uclamp_max 615
+    write /sys/kernel/vendor_sched/bg_uclamp_max 512
-    write /dev/cpuctl/background/cpu.uclamp.max 60
+    write /dev/cpuctl/background/cpu.uclamp.max 50
-    write /sys/kernel/vendor_sched/bg_group_throttle 615
+    write /sys/kernel/vendor_sched/bg_group_throttle 512
-    write /sys/kernel/vendor_sched/sysbg_uclamp_max 615
+    write /sys/kernel/vendor_sched/sysbg_uclamp_max 512
-    write /dev/cpuctl/system-background/cpu.uclamp.max 60
+    write /dev/cpuctl/system-background/cpu.uclamp.max 50
-    write /sys/kernel/vendor_sched/sysbg_group_throttle 615
+    write /sys/kernel/vendor_sched/sysbg_group_throttle 512
+    write /sys/kernel/vendor_sched/dex2oat_uclamp_max 615
+    write /dev/cpuctl/dex2oat/cpu.uclamp.max 60
+    write /sys/kernel/vendor_sched/dex2oat_group_throttle 615
 
     # Setup groups for SF (RT used for SF RE, SF used for SF main)
     write /sys/kernel/vendor_sched/rt_uclamp_min 125
@@ -732,9 +735,10 @@ on property:sys.boot_completed=1
     write /sys/kernel/vendor_sched/sf_uclamp_min 30
     write /sys/kernel/vendor_sched/sf_prefer_idle 1
 
-    # Setup cpu.shares to throttle background groups (bg ~ 5% sysbg ~ 10%)
+    # Setup cpu.shares to throttle background groups (bg ~ 5% sysbg ~ 5% dex2oat ~2.5%)
     write /dev/cpuctl/background/cpu.shares 1024
-    write /dev/cpuctl/system-background/cpu.shares 2048
+    write /dev/cpuctl/system-background/cpu.shares 1024
+    write /dev/cpuctl/dex2oat/cpu.shares 512
     write /dev/cpuctl/system/cpu.shares 20480
     # We only have system and background groups holding tasks and the groups below are empty
     write /dev/cpuctl/camera-daemon/cpu.shares 20480

pixelstats/service.cpp

@@ -57,7 +57,8 @@ const struct SysfsCollector::SysfsPaths sysfs_paths = {
 
 const struct UeventListener::UeventPaths ueventPaths = {
         .AudioUevent = "/devices/virtual/amcs/amcs",
-        .WirelessChargerPtmcPath = "/sys/class/power_supply/wireless/device/ptmc_id"};
+        .WirelessChargerPtmcPath = "/sys/class/power_supply/wireless/device/ptmc_id",
+        .TypeCPartnerUevent = "PRODUCT_TYPE="};
 
 int main() {
     LOG(INFO) << "starting PixelStats";

task_profiles.json

@@ -66,6 +66,28 @@
         }
       ]
     },
+    {
+      "Name": "Dex2oatPerformance",
+      "Actions": [
+        {
+          "Name": "JoinCgroup",
+          "Params":
+          {
+            "Controller": "cpu",
+            "Path": "dex2oat"
+          }
+        },
+        {
+          "Name": "WriteFile",
+          "Params":
+          {
+            "FilePath": "/sys/kernel/vendor_sched/set_task_group_dex2oat",
+            "Value": "<pid>",
+            "LogFailures": "false"
+          }
+        }
+      ]
+    },
     {
       "Name": "CameraServiceHighCapacity",
       "Actions": [
@@ -309,5 +331,12 @@
         }
       ]
     }
+  ],
+
+  "AggregateProfiles": [
+    {
+      "Name": "Dex2OatBootComplete",
+      "Profiles": [ "Dex2oatPerformance", "ProcessCapacityNormal", "LowIoPriority", "TimerSlackHigh" ]
+    }
   ]
 }