Snap for 8237959 from 314ea30a9f to udc-release

Change-Id: I8d480947c33d3d2706a341b8e3addb840c42032e

conf/init.gs201.rc

@@ -27,7 +27,20 @@ on init
     chown system system /sys/kernel/vendor_sched/set_task_group_rt
     chown system system /sys/kernel/vendor_sched/set_task_group_sf
     chown system system /sys/kernel/vendor_sched/set_task_group_dex2oat
-    chown system system /sys/kernel/vendor_sched/clear_group
+    chown system system /sys/kernel/vendor_sched/set_task_group_cam_power
+    chown system system /sys/kernel/vendor_sched/set_task_group_ota
+    chown system system /sys/kernel/vendor_sched/set_proc_group_bg
+    chown system system /sys/kernel/vendor_sched/set_proc_group_cam
+    chown system system /sys/kernel/vendor_sched/set_proc_group_fg
+    chown system system /sys/kernel/vendor_sched/set_proc_group_nnapi
+    chown system system /sys/kernel/vendor_sched/set_proc_group_sys
+    chown system system /sys/kernel/vendor_sched/set_proc_group_sysbg
+    chown system system /sys/kernel/vendor_sched/set_proc_group_ta
+    chown system system /sys/kernel/vendor_sched/set_proc_group_rt
+    chown system system /sys/kernel/vendor_sched/set_proc_group_sf
+    chown system system /sys/kernel/vendor_sched/set_proc_group_dex2oat
+    chown system system /sys/kernel/vendor_sched/set_proc_group_cam_power
+    chown system system /sys/kernel/vendor_sched/set_proc_group_ota
 
     chmod 0220 /sys/kernel/vendor_sched/set_task_group_bg
     chmod 0220 /sys/kernel/vendor_sched/set_task_group_cam
@@ -39,7 +52,20 @@ on init
     chmod 0220 /sys/kernel/vendor_sched/set_task_group_rt
     chmod 0220 /sys/kernel/vendor_sched/set_task_group_sf
     chmod 0220 /sys/kernel/vendor_sched/set_task_group_dex2oat
-    chmod 0220 /sys/kernel/vendor_sched/clear_group
+    chmod 0220 /sys/kernel/vendor_sched/set_task_group_cam_power
+    chmod 0220 /sys/kernel/vendor_sched/set_task_group_ota
+    chmod 0220 /sys/kernel/vendor_sched/set_proc_group_bg
+    chmod 0220 /sys/kernel/vendor_sched/set_proc_group_cam
+    chmod 0220 /sys/kernel/vendor_sched/set_proc_group_fg
+    chmod 0220 /sys/kernel/vendor_sched/set_proc_group_nnapi
+    chmod 0220 /sys/kernel/vendor_sched/set_proc_group_sys
+    chmod 0220 /sys/kernel/vendor_sched/set_proc_group_sysbg
+    chmod 0220 /sys/kernel/vendor_sched/set_proc_group_ta
+    chmod 0220 /sys/kernel/vendor_sched/set_proc_group_rt
+    chmod 0220 /sys/kernel/vendor_sched/set_proc_group_sf
+    chmod 0220 /sys/kernel/vendor_sched/set_proc_group_dex2oat
+    chmod 0220 /sys/kernel/vendor_sched/set_proc_group_cam_power
+    chmod 0220 /sys/kernel/vendor_sched/set_proc_group_ota
 
     wait /dev/block/platform/${ro.boot.boot_devices}
     symlink /dev/block/platform/${ro.boot.boot_devices} /dev/block/bootdevice

conf/init.gs201.usb.rc

@@ -71,8 +71,7 @@ on early-boot
     # acm function for uwb
     mkdir /config/usb_gadget/g1/functions/acm.uwb0
 
-    # disable permission change. TODO (b/206902205): add back later
+    setprop vendor.usb.functions.ready 1
-    # setprop vendor.usb.functions.ready 1
 
 on boot
     write /config/usb_gadget/g1/bcdDevice 0x0510

dumpstate/DumpstateDevice.cpp

@@ -501,6 +501,12 @@ void DumpstateDevice::dumpThermalSection(int fd) {
                    "for f in /sys/class/thermal/cooling* ; do "
                        "type=`cat $f/type` ; state2power_table=`cat $f/state2power_table` ; echo \"$type: $state2power_table\" ; "
                        "done"});
+    DumpFileToFd(fd, "TMU state:", "/sys/module/gs_thermal/parameters/tmu_reg_dump_state");
+    DumpFileToFd(fd, "TMU current temperature:", "/sys/module/gs_thermal/parameters/tmu_reg_dump_current_temp");
+    DumpFileToFd(fd, "TMU_TOP rise thresholds:", "/sys/module/gs_thermal/parameters/tmu_top_reg_dump_rise_thres");
+    DumpFileToFd(fd, "TMU_TOP fall thresholds:", "/sys/module/gs_thermal/parameters/tmu_top_reg_dump_fall_thres");
+    DumpFileToFd(fd, "TMU_SUB rise thresholds:", "/sys/module/gs_thermal/parameters/tmu_sub_reg_dump_rise_thres");
+    DumpFileToFd(fd, "TMU_SUB fall thresholds:", "/sys/module/gs_thermal/parameters/tmu_sub_reg_dump_fall_thres");
 }
 
 // Dump items related to touch

task_profiles.json

@@ -8,6 +8,7 @@
           "Params":
           {
             "FilePath": "/sys/kernel/vendor_sched/set_task_group_ta",
+            "ProcFilePath": "/sys/kernel/vendor_sched/set_proc_group_ta",
             "Value": "<pid>",
             "LogFailures": "false"
           }
@@ -22,6 +23,7 @@
           "Params":
           {
             "FilePath": "/sys/kernel/vendor_sched/set_task_group_cam",
+            "ProcFilePath": "/sys/kernel/vendor_sched/set_proc_group_cam",
             "Value": "<pid>",
             "LogFailures": "false"
           }
@@ -36,6 +38,7 @@
           "Params":
           {
             "FilePath": "/sys/kernel/vendor_sched/set_task_group_cam_power",
+            "ProcFilePath": "/sys/kernel/vendor_sched/set_proc_group_cam_power",
             "Value": "<pid>",
             "LogFailures": "false"
           }
@@ -50,6 +53,7 @@
           "Params":
           {
             "FilePath": "/sys/kernel/vendor_sched/set_task_group_dex2oat",
+            "ProcFilePath": "/sys/kernel/vendor_sched/set_proc_group_dex2oat",
             "Value": "<pid>",
             "LogFailures": "false"
           }
@@ -64,6 +68,7 @@
           "Params":
           {
             "FilePath": "/sys/kernel/vendor_sched/set_task_group_ota",
+            "ProcFilePath": "/sys/kernel/vendor_sched/set_proc_group_ota",
             "Value": "<pid>",
             "LogFailures": "false"
           }
@@ -117,6 +122,7 @@
           "Params":
           {
             "FilePath": "/sys/kernel/vendor_sched/set_task_group_bg",
+            "ProcFilePath": "/sys/kernel/vendor_sched/set_proc_group_bg",
             "Value": "<pid>",
             "LogFailures": "false"
           }
@@ -131,6 +137,7 @@
           "Params":
           {
             "FilePath": "/sys/kernel/vendor_sched/set_task_group_sys",
+            "ProcFilePath": "/sys/kernel/vendor_sched/set_proc_group_sys",
             "Value": "<pid>",
             "LogFailures": "false"
           }
@@ -145,6 +152,7 @@
           "Params":
           {
             "FilePath": "/sys/kernel/vendor_sched/set_task_group_fg",
+            "ProcFilePath": "/sys/kernel/vendor_sched/set_proc_group_fg",
             "Value": "<pid>",
             "LogFailures": "false"
           }
@@ -159,6 +167,7 @@
           "Params":
           {
             "FilePath": "/sys/kernel/vendor_sched/set_task_group_ta",
+            "ProcFilePath": "/sys/kernel/vendor_sched/set_proc_group_ta",
             "Value": "<pid>",
             "LogFailures": "false"
           }
@@ -173,6 +182,7 @@
           "Params":
           {
             "FilePath": "/sys/kernel/vendor_sched/set_task_group_nnapi",
+            "ProcFilePath": "/sys/kernel/vendor_sched/set_proc_group_nnapi",
             "Value": "<pid>",
             "LogFailures": "false"
           }
@@ -187,6 +197,7 @@
           "Params":
           {
             "FilePath": "/sys/kernel/vendor_sched/set_task_group_sysbg",
+            "ProcFilePath": "/sys/kernel/vendor_sched/set_proc_group_sysbg",
             "Value": "<pid>",
             "LogFailures": "false"
           }
@@ -209,6 +220,7 @@
           "Params":
           {
             "FilePath": "/sys/kernel/vendor_sched/set_task_group_sf",
+            "ProcFilePath": "/sys/kernel/vendor_sched/set_proc_group_sf",
             "Value": "<pid>",
             "LogFailures": "false"
           }
@@ -231,6 +243,7 @@
           "Params":
           {
             "FilePath": "/sys/kernel/vendor_sched/set_task_group_rt",
+            "ProcFilePath": "/sys/kernel/vendor_sched/set_proc_group_rt",
             "Value": "<pid>",
             "LogFailures": "false"
           }

usb/gadget/android.hardware.usb.gadget-service.rc

@@ -1,8 +1,7 @@
-# TODO (b/206902205): remove root permission later
 service vendor.usb-gadget-hal-1-2 /vendor/bin/hw/android.hardware.usb.gadget-service
     class hal
-    user root
+    user system
-    group root system shell mtp
+    group system shell mtp
 
 on post-fs
     chown root system /sys/class/typec/port0/power_role