wayne-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
This commit is contained in:
Jaekyun Seok 2018-08-18 21:13:46 -04:00 committed by Isaac Chen
parent d3ee69ea48
commit 35e312e135
6 changed files with 89 additions and 89 deletions

View file

@ -11,15 +11,15 @@ on boot
chown system system /sys/devices/soc/soc:fpc1020/wakeup_enable chown system system /sys/devices/soc/soc:fpc1020/wakeup_enable
chmod 0660 /sys/devices/soc/soc:fpc1020/wakeup_enable chmod 0660 /sys/devices/soc/soc:fpc1020/wakeup_enable
service fps_hal /vendor/bin/hw/android.hardware.biometrics.fingerprint@2.1-service.xiaomi_wayne service vendor.fps_hal /vendor/bin/hw/android.hardware.biometrics.fingerprint@2.1-service.xiaomi_wayne
class late_start class late_start
user system user system
group system input group system input
service goodix_script /vendor/bin/init.goodix.sh service vendor.goodix_script /vendor/bin/init.goodix.sh
class late_start class late_start
user system user system
disabled disabled
on property:ro.boot.fpsensor=gdx on property:ro.boot.fpsensor=gdx
start goodix_script start vendor.goodix_script

View file

@ -14,7 +14,7 @@ on boot
chmod 660 /sys/class/leds/red/ramp_step_ms chmod 660 /sys/class/leds/red/ramp_step_ms
chmod 660 /sys/class/leds/red/start_idx chmod 660 /sys/class/leds/red/start_idx
service light-hal-2-0 /vendor/bin/hw/android.hardware.light@2.0-service.xiaomi_wayne service vendor.light-hal-2-0 /vendor/bin/hw/android.hardware.light@2.0-service.xiaomi_wayne
class hal class hal
user system user system
group system group system

View file

@ -47,8 +47,8 @@ esac
case "$baseband" in case "$baseband" in
"msm" | "csfb" | "svlte2a" | "mdm" | "mdm2" | "sglte" | "sglte2" | "dsda2" | "unknown" | "dsda3" | "sdm" | "sdx") "msm" | "csfb" | "svlte2a" | "mdm" | "mdm2" | "sglte" | "sglte2" | "dsda2" | "unknown" | "dsda3" | "sdm" | "sdx")
start ipacm-diag start vendor.ipacm-diag
start ipacm start vendor.ipacm
case "$baseband" in case "$baseband" in
"svlte2a" | "csfb") "svlte2a" | "csfb")
start qmiproxy start qmiproxy
@ -67,24 +67,24 @@ case "$baseband" in
multisim=`getprop persist.radio.multisim.config` multisim=`getprop persist.radio.multisim.config`
if [ "$multisim" = "dsds" ] || [ "$multisim" = "dsda" ]; then if [ "$multisim" = "dsds" ] || [ "$multisim" = "dsda" ]; then
start ril-daemon2 start vendor.ril-daemon2
elif [ "$multisim" = "tsts" ]; then elif [ "$multisim" = "tsts" ]; then
start ril-daemon2 start vendor.ril-daemon2
start ril-daemon3 start vendor.ril-daemon3
fi fi
case "$datamode" in case "$datamode" in
"tethered") "tethered")
start qti start vendor.qti
start port-bridge start vendor.port-bridge
;; ;;
"concurrent") "concurrent")
start qti start vendor.qti
start netmgrd start vendor.netmgrd
start port-bridge start vendor.port-bridge
;; ;;
*) *)
start netmgrd start vendor.netmgrd
;; ;;
esac esac
esac esac

View file

@ -1336,7 +1336,7 @@ case "$target" in
case "$soc_id" in case "$soc_id" in
"277" | "278") "277" | "278")
# Start energy-awareness for 8976 # Start energy-awareness for 8976
start energy-awareness start vendor.energy-awareness
;; ;;
esac esac

View file

@ -425,7 +425,7 @@ on post-fs-data
#Create FTM_AP dir for factory test #Create FTM_AP dir for factory test
mkdir /data/FTM_AP 0775 system system mkdir /data/FTM_AP 0775 system system
service ssr_setup /system/vendor/bin/ssr_setup service vendor.ssr_setup /system/vendor/bin/ssr_setup
oneshot oneshot
disabled disabled
@ -442,7 +442,7 @@ on property:persist.sys.pil_proxy_timeout=*
write /sys/module/peripheral_loader/parameters/proxy_timeout_ms ${persist.sys.pil_proxy_timeout} write /sys/module/peripheral_loader/parameters/proxy_timeout_ms ${persist.sys.pil_proxy_timeout}
on property:persist.sys.ssr.restart_level=* on property:persist.sys.ssr.restart_level=*
start ssr_setup start vendor.ssr_setup
on property:persist.sys.ssr.enable_ramdumps=1 on property:persist.sys.ssr.enable_ramdumps=1
write /sys/module/subsystem_restart/parameters/enable_ramdumps 1 write /sys/module/subsystem_restart/parameters/enable_ramdumps 1
@ -471,107 +471,107 @@ on property:persist.debug.trace=1
write /proc/sys/kernel/core_pattern "/data/core/%E.%p.%e" write /proc/sys/kernel/core_pattern "/data/core/%E.%p.%e"
on property:sys.ftmd=1 on property:sys.ftmd=1
start ftmd start vendor.ftmd
on property:ro.bluetooth.ftm_enabled=true 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 class main
user root user root
oneshot oneshot
on property:vold.decrypt=trigger_restart_framework on property:vold.decrypt=trigger_restart_framework
start qcom-c_main-sh start vendor.qcom-c_main-sh
start config_bt_addr start config_bt_addr
start wcnss-service start wcnss-service
on property:persist.env.fastdorm.enabled=true on property:persist.env.fastdorm.enabled=true
setprop persist.radio.data_no_toggle 1 setprop persist.radio.data_no_toggle 1
service cnd /system/vendor/bin/cnd service vendor.cnd /system/vendor/bin/cnd
class main class main
user system user system
group system wifi inet radio wakelock net_admin group system wifi inet radio wakelock net_admin
service dpmQmiMgr /system/vendor/bin/dpmQmiMgr service vendor.dpmQmiMgr /system/vendor/bin/dpmQmiMgr
class main class main
user system user system
group system group system
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 class core
user root user root
oneshot oneshot
service rmt_storage /vendor/bin/rmt_storage service vendor.rmt_storage /vendor/bin/rmt_storage
class core class core
user root user root
shutdown critical shutdown critical
ioprio rt 0 ioprio rt 0
service tftp_server /vendor/bin/tftp_server service vendor.tftp_server /vendor/bin/tftp_server
class core class core
user root user root
on property:wc_transport.start_hci=true on property:wc_transport.start_hci=true
start start_hci_filter start vendor.start_hci_filter
on property:wc_transport.start_hci=false on property:wc_transport.start_hci=false
stop start_hci_filter stop vendor.start_hci_filter
service start_hci_filter /system/vendor/bin/wcnss_filter service vendor.start_hci_filter /system/vendor/bin/wcnss_filter
class late_start class late_start
user bluetooth user bluetooth
group bluetooth diag system wakelock group bluetooth diag system wakelock
seclabel u:r:bluetooth:s0 seclabel u:r:bluetooth:s0
disabled disabled
service ftmd /system/bin/logwrapper /system/vendor/bin/ftmdaemon service vendor.ftmd /system/bin/logwrapper /system/vendor/bin/ftmdaemon
class late_start class late_start
user root user root
group bluetooth net_bt_admin misc diag net_bt group bluetooth net_bt_admin misc diag net_bt
disabled disabled
oneshot oneshot
service port-bridge /system/vendor/bin/port-bridge service vendor.port-bridge /system/vendor/bin/port-bridge
class main class main
user radio system user radio system
group radio system inet group radio system inet
disabled disabled
oneshot oneshot
service netmgrd /system/vendor/bin/netmgrd service vendor.netmgrd /system/vendor/bin/netmgrd
class main class main
disabled disabled
service ipacm-diag /system/vendor/bin/ipacm-diag service vendor.ipacm-diag /system/vendor/bin/ipacm-diag
class main class main
user radio user radio
socket ipacm_log_file dgram 660 radio radio socket ipacm_log_file dgram 660 radio radio
group radio diag oem_2901 group radio diag oem_2901
disabled disabled
service ipacm /system/vendor/bin/ipacm service vendor.ipacm /system/vendor/bin/ipacm
class main class main
user radio user radio
group radio inet group radio inet
disabled disabled
service qti /system/vendor/bin/qti service vendor.qti /system/vendor/bin/qti
class main class main
user radio user radio
group radio oem_2901 diag usb net_admin group radio oem_2901 diag usb net_admin
disabled disabled
service sensors /vendor/bin/sensors.qcom service vendor.sensors /vendor/bin/sensors.qcom
class core class core
user root user root
group root group root
on property:ro.use_data_netmgrd=false on property:ro.use_data_netmgrd=false
# netmgr not supported on specific target # netmgr not supported on specific target
stop netmgrd stop vendor.netmgrd
# Adjust socket buffer to enlarge TCP receive window for high bandwidth # Adjust socket buffer to enlarge TCP receive window for high bandwidth
# but only if ro.data.large_tcp_window_size property is set. # but only if ro.data.large_tcp_window_size property is set.
@ -611,7 +611,7 @@ service vendor.wigig_supplicant /vendor/bin/hw/wpa_supplicant \
oneshot oneshot
# FST Manager with hostapd (softap) - all settings inside ini file # FST Manager with hostapd (softap) - all settings inside ini file
service fstman /vendor/bin/fstman -B -ddd -c /data/vendor/wifi/fstman.ini service vendor.fstman /vendor/bin/fstman -B -ddd -c /data/vendor/wifi/fstman.ini
user wifi user wifi
group wifi net_admin net_raw group wifi net_admin net_raw
class main class main
@ -619,7 +619,7 @@ service fstman /vendor/bin/fstman -B -ddd -c /data/vendor/wifi/fstman.ini
oneshot oneshot
# FST Manager with supplicant - connect to supplicant socket # FST Manager with supplicant - connect to supplicant socket
service fstman_wlan0 /vendor/bin/fstman -B -ddd -c /data/vendor/wifi/fstman.ini @android:wpa_wlan0 service vendor.fstman_wlan0 /vendor/bin/fstman -B -ddd -c /data/vendor/wifi/fstman.ini @android:wpa_wlan0
user wifi user wifi
group wifi net_admin net_raw group wifi net_admin net_raw
class main class main
@ -627,24 +627,24 @@ service fstman_wlan0 /vendor/bin/fstman -B -ddd -c /data/vendor/wifi/fstman.ini
oneshot oneshot
on property:netd.fstman.start=true on property:netd.fstman.start=true
start fstman start vendor.fstman
on property:netd.fstman.start=false on property:netd.fstman.start=false
stop fstman stop vendor.fstman
on property:persist.vendor.wigig.enable=1 on property:persist.vendor.wigig.enable=1
insmod /vendor/lib/modules/wil6210.ko alt_ifname=1 insmod /vendor/lib/modules/wil6210.ko alt_ifname=1
service cnss-daemon /system/vendor/bin/cnss-daemon -n -l service vendor.cnss-daemon /system/vendor/bin/cnss-daemon -n -l
class late_start class late_start
user system user system
group system inet net_admin wifi group system inet net_admin wifi
capabilities NET_ADMIN capabilities NET_ADMIN
on property:sys.shutdown.requested=* on property:sys.shutdown.requested=*
stop cnss-daemon 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 #loc_launcher will start as root and set its uid to gps
class late_start class late_start
group gps inet diag wifi group gps inet diag wifi
@ -653,33 +653,33 @@ on property:crypto.driver.load=1
insmod /system/lib/modules/qce.ko insmod /system/lib/modules/qce.ko
insmod /system/lib/modules/qcedev.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 class late_start
user root user root
oneshot 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 class late_start
user root user root
disabled disabled
oneshot oneshot
on property:sys.boot_completed=1 on property:sys.boot_completed=1
start qcom-post-boot start vendor.qcom-post-boot
service qvop-daemon /vendor/bin/qvop-daemon service vendor.qvop-daemon /vendor/bin/qvop-daemon
class late_start class late_start
user system user system
group system drmrpc group system drmrpc
service atfwd /vendor/bin/ATFWD-daemon service vendor.atfwd /vendor/bin/ATFWD-daemon
class late_start class late_start
user system user system
group system radio group system radio
disabled disabled
on property:persist.radio.atfwd.start=true on property:persist.radio.atfwd.start=true
start atfwd start vendor.atfwd
service hostapd_fst /vendor/bin/hostapd -dd -g /data/vendor/wifi/hostapd/global /data/misc/wifi/hostapd.conf service hostapd_fst /vendor/bin/hostapd -dd -g /data/vendor/wifi/hostapd/global /data/misc/wifi/hostapd.conf
class late_start class late_start
@ -699,7 +699,7 @@ on property:ro.data.large_tcp_window_size=true
# Adjust socket buffer to enlarge TCP receive window for high bandwidth (e.g. DO-RevB) # 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 write /proc/sys/net/ipv4/tcp_adv_win_scale 2
service ril-daemon2 /vendor/bin/hw/rild -c 2 service vendor.ril-daemon2 /vendor/bin/hw/rild -c 2
class main class main
socket rild2 stream 660 root radio socket rild2 stream 660 root radio
socket rild-debug2 stream 660 radio system socket rild-debug2 stream 660 radio system
@ -708,7 +708,7 @@ service ril-daemon2 /vendor/bin/hw/rild -c 2
group radio cache inet misc audio sdcard_r sdcard_rw diag oem_2901 log group radio cache inet misc audio sdcard_r sdcard_rw diag oem_2901 log
capabilities BLOCK_SUSPEND NET_ADMIN NET_RAW capabilities BLOCK_SUSPEND NET_ADMIN NET_RAW
service ril-daemon3 /vendor/bin/hw/rild -c 3 service vendor.ril-daemon3 /vendor/bin/hw/rild -c 3
class main class main
socket rild3 stream 660 root radio socket rild3 stream 660 root radio
socket rild-debug3 stream 660 radio system socket rild-debug3 stream 660 radio system
@ -722,7 +722,7 @@ service charger /charger
group system graphics group system graphics
seclabel u:r:healthd:s0 seclabel u:r:healthd:s0
service ssr_diag /system/vendor/bin/ssr_diag service vendor.ssr_diag /system/vendor/bin/ssr_diag
class late_start class late_start
user system user system
group system group system
@ -736,16 +736,16 @@ on property:sys.qbcharger.enable=true
start qbcharger start qbcharger
on property:sys.qbcharger.enable=false on property:sys.qbcharger.enable=false
stop qbcharger stop vendor.qbcharger
service diag_mdlog_start /system/vendor/bin/diag_mdlog service vendor.diag_mdlog_start /system/vendor/bin/diag_mdlog
class late_start class late_start
user shell user shell
group system diag oem_2901 sdcard_rw sdcard_r media_rw group system diag oem_2901 sdcard_rw sdcard_r media_rw
disabled disabled
oneshot oneshot
service diag_mdlog_stop /system/vendor/bin/diag_mdlog -k service vendor.diag_mdlog_stop /system/vendor/bin/diag_mdlog -k
class late_start class late_start
user shell user shell
group system diag oem_2901 sdcard_rw sdcard_r media_rw group system diag oem_2901 sdcard_rw sdcard_r media_rw
@ -753,9 +753,9 @@ service diag_mdlog_stop /system/vendor/bin/diag_mdlog -k
oneshot oneshot
on property:persist.sys.mdlog.enable=true on property:persist.sys.mdlog.enable=true
start diag_mdlog_start start vendor.diag_mdlog_start
on property:persist.sys.mdlog.enable=false on property:persist.sys.mdlog.enable=false
start diag_mdlog_stop start vendor.diag_mdlog_stop
service vendor.msm_irqbalance /vendor/bin/msm_irqbalance -f /system/vendor/etc/msm_irqbalance.conf service vendor.msm_irqbalance /vendor/bin/msm_irqbalance -f /system/vendor/etc/msm_irqbalance.conf
class core class core
@ -778,7 +778,7 @@ service vendor.msm_irqbl_sdm630 /vendor/bin/msm_irqbalance -f /system/vendor/etc
on charger on charger
setprop persist.sys.usb.config mass_storage setprop persist.sys.usb.config mass_storage
load_system_props load_system_props
start qcom-post-boot start vendor.qcom-post-boot
on property:init.svc.surfaceflinger=restarting on property:init.svc.surfaceflinger=restarting
stop hwcomposer-2-1 stop hwcomposer-2-1

View file

@ -70,7 +70,7 @@ on fs
chown system system /sys/class/thermal/thermal_message/sconfig chown system system /sys/class/thermal/thermal_message/sconfig
on post-fs on post-fs
start qseecomd start vendor.qseecomd
exec - system system -- /vendor/bin/init.qti.qseecomd.sh exec - system system -- /vendor/bin/init.qti.qseecomd.sh
on init on init
@ -88,7 +88,7 @@ on post-fs-data
mkdir /data/thermal/config 0771 system system mkdir /data/thermal/config 0771 system system
on boot on boot
start rmt_storage start vendor.rmt_storage
write /dev/cpuset/top-app/cpus 0-7 write /dev/cpuset/top-app/cpus 0-7
write /dev/cpuset/foreground/cpus 0-7 write /dev/cpuset/foreground/cpus 0-7
write /dev/cpuset/foreground/boost/cpus 0-7 write /dev/cpuset/foreground/boost/cpus 0-7
@ -120,30 +120,30 @@ on boot
chown wifi wifi /sys/module/wlan/parameters/fwpath chown wifi wifi /sys/module/wlan/parameters/fwpath
#Peripheral manager #Peripheral manager
service per_mgr /system/vendor/bin/pm-service service vendor.per_mgr /system/vendor/bin/pm-service
class core class core
user system user system
group system group system
ioprio rt 4 ioprio rt 4
service per_proxy /system/vendor/bin/pm-proxy service vendor.per_proxy /system/vendor/bin/pm-proxy
class core class core
user system user system
group system group system
disabled disabled
on property:init.svc.per_mgr=running on property:init.svc.per_mgr=running
start per_proxy start vendor.per_proxy
on property:sys.shutdown.requested=* on property:sys.shutdown.requested=*
stop per_proxy stop vendor.per_proxy
service qseecomd /vendor/bin/qseecomd service vendor.qseecomd /vendor/bin/qseecomd
class core class core
user root user root
group root group root
service thermal-engine /system/vendor/bin/thermal-engine service vendor.thermal-engine /system/vendor/bin/thermal-engine
class main class main
user root user root
socket thermal-send-client stream 0666 system system socket thermal-send-client stream 0666 system system
@ -152,42 +152,42 @@ service thermal-engine /system/vendor/bin/thermal-engine
socket thermal-send-rule stream 0660 system system socket thermal-send-rule stream 0660 system system
group root group root
service time_daemon /system/vendor/bin/time_daemon service vendor.time_daemon /system/vendor/bin/time_daemon
class late_start class late_start
user root user root
group root group root
service adsprpcd /system/vendor/bin/adsprpcd audiopd service vendor.adsprpcd /system/vendor/bin/adsprpcd audiopd
class main class main
user media user media
group media group media
service imsqmidaemon /system/vendor/bin/imsqmidaemon service vendor.imsqmidaemon /system/vendor/bin/imsqmidaemon
class main class main
user system user system
socket ims_qmid stream 0660 system radio socket ims_qmid stream 0660 system radio
group radio log diag group radio log diag
service imsdatadaemon /system/vendor/bin/imsdatadaemon service vendor.imsdatadaemon /system/vendor/bin/imsdatadaemon
class main class main
user system user system
socket ims_datad stream 0660 system radio socket ims_datad stream 0660 system radio
group system wifi radio inet log diag group system wifi radio inet log diag
disabled disabled
service energy-awareness /system/vendor/bin/energy-awareness service vendor.energy-awareness /system/vendor/bin/energy-awareness
class main class main
user system user system
group system group system
oneshot oneshot
service pd_mapper /system/vendor/bin/pd-mapper service vendor.pd_mapper /system/vendor/bin/pd-mapper
class core class core
on property:vendor.ims.QMI_DAEMON_STATUS=1 on property:vendor.ims.QMI_DAEMON_STATUS=1
start imsdatadaemon start vendor.imsdatadaemon
service ims_rtp_daemon /system/vendor/bin/ims_rtp_daemon service vendor.ims_rtp_daemon /system/vendor/bin/ims_rtp_daemon
class main class main
user system user system
group radio diag inet log group radio diag inet log
@ -201,12 +201,12 @@ service vendor.imsrcsservice /system/vendor/bin/imsrcsd
# add for HMI_L8866_A01-502: begin # add for HMI_L8866_A01-502: begin
on property:vendor.ims.DATA_DAEMON_STATUS=1 on property:vendor.ims.DATA_DAEMON_STATUS=1
start ims_rtp_daemon start vendor.ims_rtp_daemon
start vendor.imsrcsservice start vendor.imsrcsservice
setprop persist.rcs.supported 0 setprop persist.rcs.supported 0
# add for HMI_L8866_A01-502: end # 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 late_start class late_start
user system user system
group system graphics group system graphics
@ -214,35 +214,35 @@ service ppd /system/vendor/bin/mm-pp-dpps
disabled disabled
on property:init.svc.surfaceflinger=stopped on property:init.svc.surfaceflinger=stopped
stop ppd stop vendor.ppd
on property:init.svc.surfaceflinger=running on property:init.svc.surfaceflinger=running
start ppd start vendor.ppd
on property:init.svc.surfaceflinger=restarting on property:init.svc.surfaceflinger=restarting
stop ppd stop vendor.ppd
on property:init.svc.zygote=stopped on property:init.svc.zygote=stopped
stop ppd stop vendor.ppd
on property:init.svc.zygote=running on property:init.svc.zygote=running
start ppd start vendor.ppd
on property:init.svc.zygote=restarting on property:init.svc.zygote=restarting
stop ppd stop vendor.ppd
on charger on charger
load_system_props load_system_props
start qcom-post-boot start vendor.qcom-post-boot
start hvdcp_opti start vendor.hvdcp_opti
setprop sys.usb.configfs 1 setprop sys.usb.configfs 1
service qfp-daemon /vendor/bin/qfp-daemon service vendor.qfp-daemon /vendor/bin/qfp-daemon
class late_start class late_start
user system user system
group system drmrpc diag input group system drmrpc diag input
service hvdcp_opti /system/vendor/bin/hvdcp_opti service vendor.hvdcp_opti /system/vendor/bin/hvdcp_opti
class main class main
user root user root
group system wakelock group system wakelock