From 5522fd20089356ee4145df2dc5429cf2a5177d3a Mon Sep 17 00:00:00 2001
From: Ethan Chen <intervigil@gmail.com>
Date: Wed, 7 Mar 2018 10:38:27 +0000
Subject: [PATCH] sdm660-common: rootdir: move services to system-background
 cgroup

Change-Id: Id80f6369f943fc5fc1145cc6f13bddb2fe2b76e8
---
 rootdir/etc/init.qcom.rc   | 16 +++++++++++++---
 rootdir/etc/init.target.rc | 12 +++++++++++-
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc
index 1876a2d5..3ac3177e 100755
--- a/rootdir/etc/init.qcom.rc
+++ b/rootdir/etc/init.qcom.rc
@@ -538,6 +538,7 @@ service vendor.cnd /system/vendor/bin/cnd
     class main
     user system
     group system wifi inet radio wakelock net_admin
+    writepid /dev/cpuset/system-background/tasks
 
 service vendor.dpmQmiMgr /system/vendor/bin/dpmQmiMgr
     class main
@@ -548,6 +549,7 @@ service vendor.irsc_util /vendor/bin/irsc_util "/vendor/etc/sec_config"
     class core
     user root
     oneshot
+    writepid /dev/cpuset/system-background/tasks
 
 service vendor.rmt_storage /vendor/bin/rmt_storage
     class core
@@ -571,6 +573,7 @@ service vendor.start_hci_filter /system/vendor/bin/wcnss_filter
     group bluetooth diag system wakelock
     seclabel u:r:bluetooth:s0
     disabled
+    writepid /dev/cpuset/system-background/tasks
 
 service vendor.ftmd /system/bin/logwrapper /system/vendor/bin/ftmdaemon
     class late_start
@@ -585,10 +588,12 @@ service vendor.port-bridge /system/vendor/bin/port-bridge
     group radio system inet
     disabled
     oneshot
+    writepid /dev/cpuset/system-background/tasks
 
 service vendor.netmgrd /system/vendor/bin/netmgrd
     class main
     disabled
+    writepid /dev/cpuset/system-background/tasks
 
 service vendor.ipacm-diag /system/vendor/bin/ipacm-diag
     class main
@@ -602,12 +607,14 @@ service vendor.ipacm /system/vendor/bin/ipacm
     user radio
     group radio inet
     disabled
+    writepid /dev/cpuset/system-background/tasks
 
 service vendor.dataqti /system/vendor/bin/qti
     class main
     user radio
     group radio oem_2901 diag usb net_admin
     disabled
+    writepid /dev/cpuset/system-background/tasks
 
 service vendor.sensors /vendor/bin/sscrpcd
     class core
@@ -625,7 +632,7 @@ service vendor.sensors.qcom /vendor/bin/sensors.qcom
     class core
     user root
     group root
-	writepid /dev/cpuset/system-background/tasks
+    writepid /dev/cpuset/system-background/tasks
 
 on property:ro.vendor.use_data_netmgrd=false
     # netmgr not supported on specific target
@@ -652,6 +659,7 @@ service wpa_supplicant /vendor/bin/hw/wpa_supplicant \
     socket vendor_wpa_wlan0 dgram 660 wifi wifi
     disabled
     oneshot
+    writepid /dev/cpuset/system-background/tasks
 
 service vendor.wigig_supplicant /vendor/bin/hw/wpa_supplicant \
     -iwigig0 -Dnl80211 -c/data/vendor/wifi/wigig_supplicant.conf \
@@ -708,6 +716,7 @@ service vendor.cnss-daemon /system/vendor/bin/cnss-daemon -n -l
     user system
     group system inet net_admin wifi
     capabilities NET_ADMIN
+    writepid /dev/cpuset/system-background/tasks
 
 on property:sys.powerctl=*
     stop vendor.cnss-daemon
@@ -715,8 +724,8 @@ on property:sys.powerctl=*
 service vendor.loc_launcher /system/vendor/bin/loc_launcher
     #loc_launcher will start as root and set its uid to gps
     class late_start
-    user gps
-    group gps
+    group gps inet diag wifi
+    writepid /dev/cpuset/system-background/tasks
 
 on property:crypto.driver.load=1
      insmod /system/lib/modules/qce.ko
@@ -750,6 +759,7 @@ service vendor.qvop-daemon /vendor/bin/qvop-daemon
     class late_start
     user system
     group system drmrpc
+    writepid /dev/cpuset/system-background/tasks
 
 service vendor.atfwd /vendor/bin/ATFWD-daemon
     class late_start
diff --git a/rootdir/etc/init.target.rc b/rootdir/etc/init.target.rc
index 7ded4321..435a21af 100755
--- a/rootdir/etc/init.target.rc
+++ b/rootdir/etc/init.target.rc
@@ -166,17 +166,20 @@ service vendor.time_daemon /system/vendor/bin/time_daemon
    class late_start
    user root
    group root
+   writepid /dev/cpuset/system-background/tasks
 
 service vendor.adsprpcd /system/vendor/bin/adsprpcd audiopd
    class main
    user media
    group media
+   writepid /dev/cpuset/system-background/tasks
 
 service vendor.imsqmidaemon /system/vendor/bin/imsqmidaemon
     class main
     user system
     socket ims_qmid stream 0660 system radio
     group radio log diag
+    writepid /dev/cpuset/system-background/tasks
 
 service vendor.imsdatadaemon /system/vendor/bin/imsdatadaemon
     class main
@@ -184,12 +187,14 @@ service vendor.imsdatadaemon /system/vendor/bin/imsdatadaemon
     socket ims_datad stream 0660 system radio
     group system wifi radio inet log diag
     disabled
+    writepid /dev/cpuset/system-background/tasks
 
 service vendor.energy-awareness /system/vendor/bin/energy-awareness
     class main
     user system
     group system
     oneshot
+    writepid /dev/cpuset/system-background/tasks
 
 service vendor.pd_mapper /system/vendor/bin/pd-mapper
      class core
@@ -210,11 +215,15 @@ service vendor.ims_rtp_daemon /system/vendor/bin/ims_rtp_daemon
    class main
    user system
    group radio diag inet log
+   disabled
+   writepid /dev/cpuset/system-background/tasks
 
 service vendor.imsrcsservice /system/vendor/bin/imsrcsd
    class main
    user system
-   group radio diag inet log wakelock
+   group radio diag inet log
+   disabled
+   writepid /dev/cpuset/system-background/tasks
 
 on property:vendor.ims.DATA_DAEMON_STATUS=1
     start vendor.ims_rtp_daemon
@@ -263,6 +272,7 @@ service vendor.hvdcp_opti /system/vendor/bin/hvdcp_opti
      class main
      user root
      group system wakelock
+     writepid /dev/cpuset/system-background/tasks
 
 on property:persist.sys.display_srgb=1
     write /sys/class/graphics/fb0/msm_fb_srgb 1