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 http://go/treble-sysprop-compatibility.

Test: succeeded building and tested on a sailfish device.
Bug: 36796459
Change-Id: I48e6ee0ae3fe401e39efb273256d991fac676357
Signed-off-by: Alberto97 <albertop2197@gmail.com>
This commit is contained in:
Jaekyun Seok
2017-08-30 10:51:23 +09:00
committed by therootlord
parent c6c3e249ed
commit d5d0276021
3 changed files with 40 additions and 40 deletions

View File

@@ -236,7 +236,7 @@ on boot
chmod 0660 /persist/chargeonly/cooldown
# Pass carrier to wlan
service init_wifi /vendor/bin/sh /vendor/bin/wlan_carrier_bin.sh
service vendor.init_wifi /vendor/bin/sh /vendor/bin/wlan_carrier_bin.sh
class main
user root
group root
@@ -254,8 +254,8 @@ on charger
on moto-charger
setprop ro.board.platform msm8953
trigger firmware_mounts_complete
start charge_only_mode
start thermal-com
start vendor.charge_only_mode
start vendor.thermal-com
on property:ro.boot.dualsim=true
setprop persist.radio.multisim.config dsds
@@ -266,7 +266,7 @@ on property:ro.boot.dualsim=false
setprop ro.telephony.default_network 10
on property:ro.boot.hwrev=*
start mmi-boot-sh
start vendor.mmi-boot-sh
service adspd /vendor/bin/adspd
class main
@@ -274,24 +274,24 @@ service adspd /vendor/bin/adspd
user audio
group audio input diag
service mmi-boot-sh /vendor/bin/sh /vendor/bin/init.mmi.boot.sh
service vendor.mmi-boot-sh /vendor/bin/sh /vendor/bin/init.mmi.boot.sh
class core
user root
oneshot
disabled
# Sanders uses qcom sensor service
service sensors /vendor/bin/sensors.qcom
service vendor.sensors /vendor/bin/sensors.qcom
class core
user root
group root
service charge_only_mode /vendor/bin/charge_only_mode
service vendor.charge_only_mode /vendor/bin/charge_only_mode
user root
group graphics system input
disabled
service thermal-com /vendor/bin/thermal-engine --minimode
service vendor.thermal-com /vendor/bin/thermal-engine --minimode
class main
user root
disabled

View File

@@ -142,7 +142,7 @@ on boot
chown radio radio /data/vendor/radio/db_check_done
chmod 0660 /data/vendor/radio/db_check_done
start rmt_storage
start vendor.rmt_storage
#Create QMUX deamon socket area
mkdir /dev/socket/qmux_radio 0770 radio radio
@@ -498,7 +498,7 @@ on post-fs-data
setprop vold.post_fs_data_done 1
service charger /charger
service vendor.charger /charger
class charger
group log
disabled
@@ -510,13 +510,13 @@ on property:persist.usb.chgdisabled=1
on property:persist.usb.chgdisabled=0
write /sys/class/power_supply/battery/charging_enabled 1
service qseecomd /vendor/bin/qseecomd
service vendor.qseecomd /vendor/bin/qseecomd
class core
user root
group root
writepid /dev/cpuset/system-background/tasks
service thermal-engine /vendor/bin/thermal-engine
service vendor.thermal-engine /vendor/bin/thermal-engine
class main
user root
socket thermal-send-client stream 0666 system system
@@ -526,7 +526,7 @@ service thermal-engine /vendor/bin/thermal-engine
group root
writepid /dev/cpuset/system-background/tasks
service time_daemon /vendor/bin/time_daemon
service vendor.time_daemon /vendor/bin/time_daemon
class late_start
user root
group root
@@ -544,57 +544,57 @@ on property:persist.env.fastdorm.enabled=true
setprop persist.radio.data_no_toggle 1
#start camera server as daemon
service qcamerasvr /vendor/bin/mm-qcamera-daemon
service vendor.qcamerasvr /vendor/bin/mm-qcamera-daemon
class late_start
user camera
group camera system inet input graphics
writepid /dev/cpuset/system-background/tasks
service cnd /vendor/bin/cnd
service vendor.cnd /vendor/bin/cnd
class late_start
socket cnd stream 660 root inet
service qseeproxydaemon /vendor/bin/qseeproxydaemon
service vendor.qseeproxydaemon /vendor/bin/qseeproxydaemon
class late_start
user system
group system
writepid /dev/cpuset/system-background/tasks
service esepmdaemon /vendor/bin/esepmdaemon
service vendor.esepmdaemon /vendor/bin/esepmdaemon
class core
user system
group nfc
service wcnss-service /vendor/bin/wcnss_service
service vendor.wcnss-service /vendor/bin/wcnss_service
class main
user system
group system wifi radio
oneshot
service adsprpcd /vendor/bin/adsprpcd
service vendor.adsprpcd /vendor/bin/adsprpcd
class main
user media
group media
#service energy-awareness /vendor/bin/energy-awareness
#service vendor.energy-awareness /vendor/bin/energy-awareness
# class main
# user root
# group system
# oneshot
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
service imsqmidaemon /vendor/bin/imsqmidaemon
service vendor.imsqmidaemon /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 imsdatadaemon /vendor/bin/imsdatadaemon
service vendor.imsdatadaemon /vendor/bin/imsdatadaemon
class main
user system
socket ims_datad stream 0660 system radio
@@ -603,16 +603,16 @@ service imsdatadaemon /vendor/bin/imsdatadaemon
disabled
on property:vendor.ims.QMI_DAEMON_STATUS=1
start imsdatadaemon
start vendor.imsdatadaemon
service ims_rtp_daemon /vendor/bin/ims_rtp_daemon
service vendor.ims_rtp_daemon /vendor/bin/ims_rtp_daemon
class main
user system
socket ims_rtpd stream 0660 system radio
group radio diag inet log
disabled
service imsrcsservice /vendor/bin/imsrcsd
service vendor.imsrcsservice /vendor/bin/imsrcsd
class main
user system
group radio diag inet log
@@ -620,10 +620,10 @@ service imsrcsservice /vendor/bin/imsrcsd
disabled
on property:vendor.ims.DATA_DAEMON_STATUS=1
start ims_rtp_daemon
start imsrcsservice
start vendor.ims_rtp_daemon
start vendor.imsrcsservice
service rmt_storage /vendor/bin/rmt_storage
service vendor.rmt_storage /vendor/bin/rmt_storage
class core
user root
ioprio rt 0
@@ -661,18 +661,18 @@ service fmhal_service /vendor/bin/fmhal_service
group bluetooth net_bt_admin net_admin
disabled
service tftp_server /vendor/bin/tftp_server
service vendor.tftp_server /vendor/bin/tftp_server
class core
user root
writepid /dev/cpuset/system-background/tasks
service per_mgr /vendor/bin/pm-service
service vendor.per_mgr /vendor/bin/pm-service
class core
user system
group system net_raw
writepid /dev/cpuset/system-background/tasks
service per_proxy /vendor/bin/pm-proxy
service vendor.per_proxy /vendor/bin/pm-proxy
class core
user system
group system
@@ -680,20 +680,20 @@ service per_proxy /vendor/bin/pm-proxy
writepid /dev/cpuset/system-background/tasks
on property:init.svc.per_mgr=running
start per_proxy
start vendor.per_proxy
on property:sys.shutdown.requested=*
stop per_proxy
stop vendor.per_proxy
on property:ro.hw.ecompass=true
enable ecompassd
service netmgrd /vendor/bin/netmgrd
service vendor.netmgrd /vendor/bin/netmgrd
class main
group radio system wakelock
writepid /dev/cpuset/system-background/tasks
service qti /vendor/bin/qti
service vendor.qti /vendor/bin/qti
class main
user radio
group radio net_raw oem_2950 usb net_admin
@@ -701,7 +701,7 @@ service qti /vendor/bin/qti
on property:ro.use_data_netmgrd=false
# netmgr not supported on specific target
stop netmgrd
stop vendor.netmgrd
# Adjust socket buffer to enlarge TCP receive window for high bandwidth
# but only if ro.data.large_tcp_window_size property is set.
@@ -814,7 +814,7 @@ service dhcpcd_bnep4 /system/bin/dhcpcd -BKLG
disabled
oneshot
service loc_launcher /vendor/bin/loc_launcher
service vendor.loc_launcher /vendor/bin/loc_launcher
#loc_launcher will start as root and set its uid to gps
class late_start
group gps inet oem_2950 wifi
@@ -846,7 +846,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)
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
user radio
group radio cache inet misc audio log readproc wakelock

View File

@@ -4,5 +4,5 @@ export PATH=/system/xbin:$PATH
multisim=`getprop persist.radio.multisim.config`
if [ "$multisim" = "dsds" ] || [ "$multisim" = "dsda" ]; then
start ril-daemon2
start vendor.ril-daemon2
fi