From 17f4b877b8b15881080c052f992f74e2e4062c52 Mon Sep 17 00:00:00 2001 From: Jaekyun Seok Date: Sat, 18 Aug 2018 21:13:46 -0400 Subject: [PATCH] sdm660-common: rootdir: Add 'vendor.' prefix to a vendor HAL service name * To prevent property name collisions between properties of system and vendor, 'vendor.' prefix must be added to a vendor HAL service name. You can see the details in go/treble-sysprop-compatibility documents. Test: succeeded building and tested on a sailfish device. Bug: 36796459 Change-Id: I48e6ee0ae3fe401e39efb273256d991fac676357 --- rootdir/bin/init.qcom.post_boot.sh | 2 +- rootdir/etc/init.qcom.rc | 94 +++++++++--------------------- rootdir/etc/init.target.rc | 64 ++++++++++---------- 3 files changed, 57 insertions(+), 103 deletions(-) diff --git a/rootdir/bin/init.qcom.post_boot.sh b/rootdir/bin/init.qcom.post_boot.sh index 12600b0c..c5c18bbd 100755 --- a/rootdir/bin/init.qcom.post_boot.sh +++ b/rootdir/bin/init.qcom.post_boot.sh @@ -1602,7 +1602,7 @@ case "$target" in case "$soc_id" in "277" | "278") # Start energy-awareness for 8976 - start energy-awareness + start vendor.energy-awareness ;; esac diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc index b328fe10..1876a2d5 100755 --- a/rootdir/etc/init.qcom.rc +++ b/rootdir/etc/init.qcom.rc @@ -517,20 +517,19 @@ on property:persist.debug.trace=1 on property:init.svc.wpa_supplicant=stopped stop dhcpcd on property:sys.ftmd=1 - start ftmd + start vendor.ftmd on property:ro.bluetooth.ftm_enabled=true - start ftmd + start vendor.ftmd -service qcom-c_main-sh /vendor/bin/init.class_main.sh +service vendor.qcom-c_main-sh /vendor/bin/init.class_main.sh class main user root oneshot on property:vold.decrypt=trigger_restart_framework - start qcom-c_main-sh - start config_bt_addr - start wcnss-service + start vendor.qcom-c_main-sh + start vendor.cnss_diag on property:persist.env.fastdorm.enabled=true setprop persist.radio.data_no_toggle 1 @@ -540,18 +539,12 @@ service vendor.cnd /system/vendor/bin/cnd user system group system wifi inet radio wakelock net_admin -service dpmQmiMgr /system/vendor/bin/dpmQmiMgr +service vendor.dpmQmiMgr /system/vendor/bin/dpmQmiMgr class main user system group radio system -service vendor.qrtr-ns /vendor/bin/qrtr-ns -f -i 1 - class core - user system - group system net_admin - capabilities NET_BIND_SERVICE NET_ADMIN - -service irsc_util /vendor/bin/irsc_util "/vendor/etc/sec_config" +service vendor.irsc_util /vendor/bin/irsc_util "/vendor/etc/sec_config" class core user root oneshot @@ -579,7 +572,7 @@ service vendor.start_hci_filter /system/vendor/bin/wcnss_filter seclabel u:r:bluetooth:s0 disabled -service ftmd /system/bin/logwrapper /system/vendor/bin/ftmdaemon +service vendor.ftmd /system/bin/logwrapper /system/vendor/bin/ftmdaemon class late_start user root group bluetooth net_bt_admin misc net_bt_stack diag net_bt @@ -616,12 +609,6 @@ service vendor.dataqti /system/vendor/bin/qti group radio oem_2901 diag usb net_admin disabled -service vendor.dataadpl /system/vendor/bin/adpl - class main - user radio - group radio oem_2901 diag usb net_admin - disabled - service vendor.sensors /vendor/bin/sscrpcd class core user system @@ -634,7 +621,7 @@ service vendor.sensors.qti /vendor/bin/sensors.qti group system disabled -service vendor.sensors2 /vendor/bin/sensors.qcom +service vendor.sensors.qcom /vendor/bin/sensors.qcom class core user root group root @@ -682,7 +669,7 @@ service vendor.wigig_supplicant /vendor/bin/hw/wpa_supplicant \ oneshot # FST Manager with hostapd (softap) - all settings inside ini file -service fstman /vendor/bin/fstman -B -ddd -c /data/vendor/wifi/fstman.ini -a 1 +service vendor.fstman /vendor/bin/fstman -B -ddd -c /data/vendor/wifi/fstman.ini -a 1 user wifi group wifi capabilities NET_ADMIN NET_RAW @@ -691,7 +678,7 @@ service fstman /vendor/bin/fstman -B -ddd -c /data/vendor/wifi/fstman.ini -a 1 oneshot # FST Manager with supplicant - connect to supplicant socket -service fstman_wlan0 /vendor/bin/fstman -B -ddd -c /data/vendor/wifi/fstman.ini \ +service vendor.fstman_wlan0 /vendor/bin/fstman -B -ddd -c /data/vendor/wifi/fstman.ini \ -a 0 @android:vendor_wpa_wlan0 user wifi group wifi @@ -701,31 +688,32 @@ service fstman_wlan0 /vendor/bin/fstman -B -ddd -c /data/vendor/wifi/fstman.ini oneshot on property:netd.fstman.start=true - start fstman + start vendor.fstman on property:netd.fstman.start=false - stop fstman + stop vendor.fstman on property:persist.vendor.wigig.enable=1 insmod /vendor/lib/modules/wil6210.ko alt_ifname=1 service vendor.cnss_diag /system/vendor/bin/cnss_diag -q - class late_start + class main user system group system wifi inet net_admin sdcard_rw media_rw diag disabled oneshot -service cnss-daemon /system/vendor/bin/cnss-daemon -n -l +service vendor.cnss-daemon /system/vendor/bin/cnss-daemon -n -l class late_start user system group system inet net_admin wifi capabilities NET_ADMIN -on property:sys.shutdown.requested=* - stop cnss-daemon +on property:sys.powerctl=* + stop vendor.cnss-daemon -service loc_launcher /system/vendor/bin/loc_launcher +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 @@ -734,7 +722,7 @@ on property:crypto.driver.load=1 insmod /system/lib/modules/qce.ko insmod /system/lib/modules/qcedev.ko -service qcom-sh /vendor/bin/init.qcom.sh +service vendor.qcom-sh /vendor/bin/init.qcom.sh class late_start user root group root system radio @@ -745,7 +733,7 @@ service vendor-sensor-sh /vendor/bin/init.qcom.sensors.sh user root oneshot -service qcom-post-boot /vendor/bin/init.qcom.post_boot.sh +service vendor.qcom-post-boot /vendor/bin/init.qcom.post_boot.sh class late_start user root group root system wakelock graphics @@ -753,13 +741,12 @@ service qcom-post-boot /vendor/bin/init.qcom.post_boot.sh oneshot on property:sys.boot_completed=1 - start qcom-post-boot - start qti-testscripts + start vendor.qcom-post-boot on property:ro.vendor.ril.mbn_copy_completed=1 write /data/vendor/radio/copy_complete 1 -service qvop-daemon /vendor/bin/qvop-daemon +service vendor.qvop-daemon /vendor/bin/qvop-daemon class late_start user system group system drmrpc @@ -790,11 +777,6 @@ on property:ro.data.large_tcp_window_size=true # Adjust socket buffer to enlarge TCP receive window for high bandwidth (e.g. DO-RevB) write /proc/sys/net/ipv4/tcp_adv_win_scale 2 -service battery_monitor /system/bin/battery_monitor - user system - group system - disabled - service vendor.ril-daemon2 /vendor/bin/hw/rild -c 2 class main user radio @@ -828,13 +810,7 @@ on property:sys.qbcharger.enable=true start qbcharger on property:sys.qbcharger.enable=false - stop qbcharger - - -on property:persist.vendor.mdlog.enable=true - start diag_mdlog_start -on property:persist.vendor.mdlog.enable=false - start diag_mdlog_stop + stop vendor.qbcharger service vendor.msm_irqbalance /vendor/bin/msm_irqbalance -f /system/vendor/etc/msm_irqbalance.conf class core @@ -857,7 +833,7 @@ service vendor.msm_irqbl_sdm630 /vendor/bin/msm_irqbalance -f /system/vendor/etc on charger setprop persist.sys.usb.config mass_storage load_system_props - start qcom-post-boot + start vendor.qcom-post-boot on property:init.svc.surfaceflinger=restarting stop vendor.hwcomposer-2-1 @@ -897,21 +873,8 @@ on property:sys.thermal.isincall=1 on property:sys.thermal.isincall=0 write /sys/class/power_supply/battery/device/thermalcall 0 -service vendor.move_time_data /system/bin/move_time_data.sh - class main - user system - group system - disabled - oneshot -service vendor.hbtp /vendor/bin/hbtp_daemon - class main - user system - group system - capabilities SYS_NICE - disabled - -service chre /vendor/bin/chre +service vendor.chre /vendor/bin/chre class late_start user system group system @@ -924,11 +887,6 @@ service config_bt_addr /vendor/bin/btnvtool -O group bluetooth radio oneshot -service bugreport /system/bin/dumpstate -d -p -B -z -o /data/user_de/0/com.android.shell/files/bugreports/bugreport - class main - disabled - oneshot - keycodes 114 115 116 #Set GPU Opengles version on property:vendor.opengles.version=* setprop ro.opengles.version ${vendor.opengles.version} diff --git a/rootdir/etc/init.target.rc b/rootdir/etc/init.target.rc index a0b16496..7ded4321 100755 --- a/rootdir/etc/init.target.rc +++ b/rootdir/etc/init.target.rc @@ -67,7 +67,6 @@ on fs on post-fs start vendor.qseecomd - write /dev/ipa 1 exec - system system -- /vendor/bin/init.qti.qseecomd.sh on init @@ -86,7 +85,7 @@ on post-fs-data start pa-cal-load on boot - start rmt_storage + start vendor.rmt_storage write /dev/cpuset/top-app/cpus 0-7 write /dev/cpuset/foreground/cpus 0-7 write /dev/cpuset/background/cpus 0-7 @@ -146,26 +145,15 @@ service vendor.per_proxy /system/vendor/bin/pm-proxy on property:init.svc.vendor.per_mgr=running start vendor.per_proxy -on property:sys.shutdown.requested=* +on property:sys.powerctl=* stop vendor.per_proxy -on property:sys.thermallct.isincall=1 - write /sys/class/power_supply/battery/device/thermalcall 1 -on property:sys.thermallct.isincall=0 - write /sys/class/power_supply/battery/device/thermalcall 0 - -on property:sys.thermallct.isinvideo=1 - write /sys/class/thermal/thermal_message/sconfig 12 - -on property:sys.thermallct.isinvideo=0 - write /sys/class/thermal/thermal_message/sconfig 0 - -service vendor.qseecomd /vendor/bin/qseecomdecomd +service vendor.qseecomd /vendor/bin/qseecomd class core user root group root -service thermal-engine /system/vendor/bin/thermal-engine +service vendor.thermal-engine /system/vendor/bin/thermal-engine class main user root socket thermal-send-client stream 0666 system system @@ -174,25 +162,22 @@ service thermal-engine /system/vendor/bin/thermal-engine socket thermal-send-rule stream 0660 system system group root -service time_daemon /system/vendor/bin/time_daemon +service vendor.time_daemon /system/vendor/bin/time_daemon class late_start user root group root -service adsprpcd /vendor/bin/adsprpcd audiopd +service vendor.adsprpcd /system/vendor/bin/adsprpcd audiopd class main user media group media - -## imsdatadaemon starts with root and UID will be downgraded to SYSTEM. service vendor.imsqmidaemon /system/vendor/bin/imsqmidaemon class main user system socket ims_qmid stream 0660 system radio group radio log diag -# imsdatadaemon starts with root and UID will be downgraded to SYSTEM. service vendor.imsdatadaemon /system/vendor/bin/imsdatadaemon class main user system @@ -200,7 +185,7 @@ service vendor.imsdatadaemon /system/vendor/bin/imsdatadaemon group system wifi radio inet log diag disabled -service energy-awareness /system/vendor/bin/energy-awareness +service vendor.energy-awareness /system/vendor/bin/energy-awareness class main user system group system @@ -215,7 +200,7 @@ on property:vendor.ims.QMI_DAEMON_STATUS=1 #on property:vold.decrypt=trigger_restart_framework # start cnss_diag -service cnss_diag /system/vendor/bin/cnss_diag -q -f -t HELIUM +service vendor.cnss_diag /system/vendor/bin/cnss_diag -q -f -t HELIUM class main user system group system wifi inet sdcard_rw media_rw diag @@ -232,10 +217,12 @@ service vendor.imsrcsservice /system/vendor/bin/imsrcsd group radio diag inet log wakelock on property:vendor.ims.DATA_DAEMON_STATUS=1 - restart vendor.ims_rtp_daemon + start vendor.ims_rtp_daemon + start vendor.imsrcsservice + setprop persist.rcs.supported 0 +# add for HMI_L8866_A01-502: end - -service ppd /system/vendor/bin/mm-pp-dpps +service vendor.ppd /system/vendor/bin/mm-pp-dpps class hal user system group system graphics @@ -243,31 +230,40 @@ service ppd /system/vendor/bin/mm-pp-dpps disabled on property:init.svc.surfaceflinger=stopped - stop ppd + stop vendor.ppd on property:init.svc.surfaceflinger=running - start ppd + start vendor.ppd on property:init.svc.surfaceflinger=restarting - stop ppd + stop vendor.ppd on property:init.svc.zygote=stopped - stop ppd + stop vendor.ppd on property:init.svc.zygote=running - start ppd + start vendor.ppd on property:init.svc.zygote=restarting - stop ppd + stop vendor.ppd on charger load_system_props - start qcom-post-boot - mkdir /data/vendor/charge_logger 0771 system system + start vendor.qcom-post-boot start vendor.hvdcp_opti setprop sys.usb.configfs 1 start vendor.power_off_alarm +service vendor.qfp-daemon /vendor/bin/qfp-daemon + class late_start + user system + group system drmrpc diag input + +service vendor.hvdcp_opti /system/vendor/bin/hvdcp_opti + class main + user root + group system wakelock + on property:persist.sys.display_srgb=1 write /sys/class/graphics/fb0/msm_fb_srgb 1