From c335406857132a562a127eee0ff4d43cf4ec5eee Mon Sep 17 00:00:00 2001 From: Jaekyun Seok Date: Wed, 20 Sep 2017 13:58:59 +0900 Subject: [PATCH] Add 'vendor.' prefix to a vendor daemon 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: I5af6535272dd9d6423482e895cb7b46e483e1978 --- init.common.diag.rc.userdebug | 12 ++-- init.common.nanohub.rc | 6 +- init.common.rc | 100 +++++++++++++++++----------------- power/Power.cpp | 2 +- sepolicy/property_contexts | 2 +- vr/vr.c | 2 +- 6 files changed, 62 insertions(+), 62 deletions(-) diff --git a/init.common.diag.rc.userdebug b/init.common.diag.rc.userdebug index d792b498d..08d063ec9 100644 --- a/init.common.diag.rc.userdebug +++ b/init.common.diag.rc.userdebug @@ -96,24 +96,24 @@ on property:sys.usb.config=diag,serial_cdev,serial_tty,rmnet_ipa,mass_storage,ad setprop sys.usb.state ${sys.usb.config} on property:persist.sys.cnss.diag_qxdm=true - start cnss_diag + start vendor.cnss_diag on property:persist.sys.cnss.diag_qxdm=false - stop cnss_diag + stop vendor.cnss_diag on property:persist.sys.cnss.diag_txt=true - start cnss_diag_txt + start vendor.cnss_diag_txt on property:persist.sys.cnss.diag_txt=false - stop cnss_diag_txt + stop vendor.cnss_diag_txt -service cnss_diag /vendor/bin/cnss_diag -q -u +service vendor.cnss_diag /vendor/bin/cnss_diag -q -u class late_start user system group system oneshot -service cnss_diag_txt /vendor/bin/cnss_diag -s -f -m /data/vendor/wifi/cnss_diag/cnss_diag.conf +service vendor.cnss_diag_txt /vendor/bin/cnss_diag -s -f -m /data/vendor/wifi/cnss_diag/cnss_diag.conf class late_start user system group system diff --git a/init.common.nanohub.rc b/init.common.nanohub.rc index c7adc2029..e8df42e69 100644 --- a/init.common.nanohub.rc +++ b/init.common.nanohub.rc @@ -2,20 +2,20 @@ on post-fs ## ensure correct calibration file permissions chown root system /persist/sensorcal.json chmod 0640 /persist/sensorcal.json - start flash-nanohub-fw + start vendor.flash-nanohub-fw on post-fs-data mkdir /data/vendor/sensor chown root system /data/vendor/sensor chmod 0770 /data/vendor/sensor -service flash-nanohub-fw /vendor/bin/nanoapp_cmd download +service vendor.flash-nanohub-fw /vendor/bin/nanoapp_cmd download oneshot disabled user root group system -service nanohub_slpi /vendor/bin/nanohub_slpi +service vendor.nanohub_slpi /vendor/bin/nanohub_slpi class late_start user root group system diff --git a/init.common.rc b/init.common.rc index b22b752a8..d0c2925fd 100644 --- a/init.common.rc +++ b/init.common.rc @@ -9,7 +9,7 @@ on charger write /sys/devices/soc/624000.ufshc/624000.ufshc:ufs_variant/pm_qos_enable 1 write /sys/module/lpm_levels/parameters/sleep_disabled N -service charger /charger +service vendor.charger /charger class charger seclabel u:r:charger:s0 @@ -31,7 +31,7 @@ on init # We have vendor/ as early mount so we can start qseecomd earlier # early mount partions e.g. vendor/ will be mounted in init first stage # see b/27805372 - start qseecomd + start vendor.qseecomd # Support legacy paths symlink /sdcard /mnt/sdcard @@ -124,7 +124,7 @@ on post-fs on late-fs # Start devices by sysfs trigger - start devstart_sh + start vendor.devstart_sh # Start services for bootanim start surfaceflinger @@ -146,13 +146,13 @@ on late-fs write /sys/block/dm-1/queue/read_ahead_kb 2048 # Start time daemon early so that the system time can be set early - start time_daemon + start vendor.time_daemon on post-fs-data # We can start netd here before in is launched in common init.rc on zygote-start start netd # Set sku property - start mid_sh + start vendor.mid_sh # Wait until the system time is set wait_for_prop sys.time.set true @@ -402,7 +402,7 @@ on boot write /proc/sys/kernel/sched_init_task_load 100 # Exec init.foreground.sh in background - start foreground_sh + start vendor.foreground_sh # add a cpuset for the camera daemon # we want all cores for camera mkdir /dev/cpuset/camera-daemon @@ -538,36 +538,36 @@ on boot chown wifi wifi /sys/module/wlan/parameters/fwpath on property:wc_transport.start_hci=true - start start_hci_filter + start vendor.start_hci_filter on property:wc_transport.start_hci=false - stop start_hci_filter + stop vendor.start_hci_filter -service start_hci_filter /vendor/bin/wcnss_filter +service vendor.start_hci_filter /vendor/bin/wcnss_filter class late_start user bluetooth group bluetooth diag disabled on property:wc_transport.start_root=true - start hci_filter_root + start vendor.hci_filter_root on property:wc_transport.start_root=false - stop hci_filter_root + stop vendor.hci_filter_root -service hci_filter_root /vendor/bin/wcnss_filter +service vendor.hci_filter_root /vendor/bin/wcnss_filter class late_start user bluetooth group bluetooth diag system disabled -service per_mgr /vendor/bin/pm-service +service vendor.per_mgr /vendor/bin/pm-service class core user system group system ioprio rt 4 -service per_proxy /vendor/bin/pm-proxy +service vendor.per_proxy /vendor/bin/pm-proxy class core user system group system @@ -576,20 +576,20 @@ service per_proxy /vendor/bin/pm-proxy on property:ro.build.type=userdebug write /sys/class/uio/uio1/device/rtel/rtel 1 -on property:init.svc.per_mgr=running - start per_proxy +on property:init.svc.vendor.per_mgr=running + start vendor.per_proxy on property:sys.shutdown.requested=* - stop per_proxy + stop vendor.per_proxy # Disable subsystem restart write /sys/module/subsystem_restart/parameters/disable_restart_work 0x9889deed -service qseecomd /vendor/bin/qseecomd +service vendor.qseecomd /vendor/bin/qseecomd class core user root group root -service thermal-engine /vendor/bin/thermal-engine -c ${sys.qcom.thermalcfg:-/vendor/etc/thermal-engine.conf} +service vendor.thermal-engine /vendor/bin/thermal-engine -c ${sys.qcom.thermalcfg:-/vendor/etc/thermal-engine.conf} class main user root group root system @@ -597,23 +597,23 @@ service thermal-engine /vendor/bin/thermal-engine -c ${sys.qcom.thermalcfg:-/ven socket thermal-recv-client stream 0660 system system socket thermal-recv-passive-client stream 0666 system system -service time_daemon /vendor/bin/time_daemon +service vendor.time_daemon /vendor/bin/time_daemon class core user root group root -service adsprpcd /vendor/bin/adsprpcd +service vendor.adsprpcd /vendor/bin/adsprpcd class main user media group media -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 -service imsdatadaemon /vendor/bin/imsdatadaemon +service vendor.imsdatadaemon /vendor/bin/imsdatadaemon class main user system socket ims_datad stream 0660 system radio @@ -621,9 +621,9 @@ service imsdatadaemon /vendor/bin/imsdatadaemon disabled on property:sys.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 @@ -632,15 +632,15 @@ service ims_rtp_daemon /vendor/bin/ims_rtp_daemon on property:sys.ims.DATA_DAEMON_STATUS=1 - start ims_rtp_daemon + start vendor.ims_rtp_daemon -service ssr_setup /vendor/bin/ssr_setup +service vendor.ssr_setup /vendor/bin/ssr_setup class main user root group root system oneshot -service ss_ramdump /vendor/bin/subsystem_ramdump +service vendor.ss_ramdump /vendor/bin/subsystem_ramdump class main user root group root system @@ -650,7 +650,7 @@ on property:persist.sys.ssr.enable_ramdumps=1 write /sys/module/subsystem_restart/parameters/enable_ramdumps 1 mkdir /data/vendor/ramdump 761 root system mkdir /data/vendor/ssrdump 771 root system - start ss_ramdump + start vendor.ss_ramdump on property:persist.sys.ssr.enable_ramdumps=0 write /sys/module/subsystem_restart/parameters/enable_ramdumps 0 @@ -661,37 +661,37 @@ service iop /system/bin/iop group root disabled -service cnd /vendor/bin/cnd +service vendor.cnd /vendor/bin/cnd user root group root inet wakelock class late_start socket cnd stream 660 root inet -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 rmt_storage /vendor/bin/rmt_storage +service vendor.rmt_storage /vendor/bin/rmt_storage class core user root group root system wakelock ioprio rt 0 shutdown critical -service port-bridge /vendor/bin/port-bridge +service vendor.port-bridge /vendor/bin/port-bridge class main user radio group radio system inet oneshot -service qmiproxy /vendor/bin/qmiproxy +service vendor.qmiproxy /vendor/bin/qmiproxy class main user radio group radio diag disabled -service netmgrd /vendor/bin/netmgrd +service vendor.netmgrd /vendor/bin/netmgrd class main user root group root wifi wakelock radio inet @@ -712,56 +712,56 @@ service wpa_supplicant /vendor/bin/hw/wpa_supplicant \ disabled oneshot -service cnss-daemon /vendor/bin/cnss-daemon -n -l +service vendor.cnss-daemon /vendor/bin/cnss-daemon -n -l class late_start user system group system inet wifi -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 diag wifi -service init-radio-sh /vendor/bin/init.radio.sh +service vendor.init-radio-sh /vendor/bin/init.radio.sh class late_start user radio group root radio oneshot -service msm_irqbalance /vendor/bin/msm_irqbalance -f /vendor/etc/msm_irqbalance.conf +service vendor.msm_irqbalance /vendor/bin/msm_irqbalance -f /vendor/etc/msm_irqbalance.conf socket msm_irqbalance seqpacket 660 root system class core user root group root writepid /dev/cpuset/system-background/tasks -service atfwd /vendor/bin/ATFWD-daemon +service vendor.atfwd /vendor/bin/ATFWD-daemon class late_start user system group system radio disabled -service ssr_diag /vendor/bin/ssr_diag +service vendor.ssr_diag /vendor/bin/ssr_diag class late_start user system group system disabled -service diag_mdlog_start /vendor/bin/diag_mdlog +service vendor.diag_mdlog_start /vendor/bin/diag_mdlog class late_start user shell group system diag sdcard_rw sdcard_r media_rw disabled oneshot -service diag_mdlog_stop /vendor/bin/diag_mdlog -k +service vendor.diag_mdlog_stop /vendor/bin/diag_mdlog -k class late_start user shell group system diag sdcard_rw sdcard_r media_rw disabled oneshot -service perfd /vendor/bin/perfd +service vendor.perfd /vendor/bin/perfd class main user root group root system @@ -777,10 +777,10 @@ service bugreport /system/bin/dumpstate -d -p -B -z \ keycodes 114 115 116 on property:sys.post_boot.parsed=1 - start perfd + start vendor.perfd on property:sys.boot_completed=1 - start power_sh + start vendor.power_sh # Enable UFS powersaving write /sys/devices/soc/624000.ufshc/clkscale_enable 1 @@ -825,28 +825,28 @@ on property:sys.retaildemo.enabled=1 on property:sys.retaildemo.enabled=0 write /sys/class/power_supply/battery/full_level_dis_batt_chg 100 -service devstart_sh /vendor/bin/init.qcom.devstart.sh +service vendor.devstart_sh /vendor/bin/init.qcom.devstart.sh class main user root group root system disabled oneshot -service foreground_sh /vendor/bin/init.foreground.sh +service vendor.foreground_sh /vendor/bin/init.foreground.sh class main user root group root system readproc disabled oneshot -service power_sh /vendor/bin/init.power.sh +service vendor.power_sh /vendor/bin/init.power.sh class main user root group root system disabled oneshot -service mid_sh /vendor/bin/init.mid.sh +service vendor.mid_sh /vendor/bin/init.mid.sh class main user root group root system diff --git a/power/Power.cpp b/power/Power.cpp index 82b450deb..2a5534c87 100644 --- a/power/Power.cpp +++ b/power/Power.cpp @@ -53,7 +53,7 @@ Return Power::setInteractive(bool interactive) { } Return Power::powerHint(PowerHint hint, int32_t data) { - if (android::base::GetProperty("init.svc.perfd", "") != "running") { + if (android::base::GetProperty("init.svc.vendor.perfd", "") != "running") { ALOGW("perfd is not started"); return Void(); } diff --git a/sepolicy/property_contexts b/sepolicy/property_contexts index 68e9df431..63d49efdb 100644 --- a/sepolicy/property_contexts +++ b/sepolicy/property_contexts @@ -11,7 +11,7 @@ debug.ssrdump u:object_r:ssr_prop:s0 persist.sys.cnss. u:object_r:cnss_diag_prop:s0 persist.sys.crash_rcu u:object_r:ramdump_prop:s0 sys.qcom.thermalcfg u:object_r:thermal_prop:s0 -ctl.thermal-engine u:object_r:thermal_prop:s0 +ctl.vendor.thermal-engine u:object_r:thermal_prop:s0 sys.time.set u:object_r:sys_time_prop:s0 sys.post_boot.parsed u:object_r:post_boot_prop:s0 sys.logger.bluetooth u:object_r:bluetooth_log_prop:s0 diff --git a/vr/vr.c b/vr/vr.c index 18d4e53b6..238d37f58 100644 --- a/vr/vr.c +++ b/vr/vr.c @@ -23,7 +23,7 @@ #include static void restart_thermal_engine() { - if (property_set("ctl.restart", "thermal-engine")) { + if (property_set("ctl.restart", "vendor.thermal-engine")) { ALOGE("%s: couldn't set a system property, " "ctl.restart.", __FUNCTION__); }