From ce6d16fac8b02117cb8f427c36e5242dfe57a789 Mon Sep 17 00:00:00 2001 From: Tushar Janefalkar Date: Wed, 15 Jan 2014 11:48:43 -0800 Subject: [PATCH] Remove location related processes from init scripts The native proceses that are used by location features have been moved from the init scripts and will now be launched from a native launcher processes. This launcher process will be started from init.rc Change-Id: I00101fcdff61824c31fd9510bc6202cb943dcd8c CRs-fixed: 600179 --- rootdir/etc/init.qcom.rc | 43 +++--------------------------- rootdir/etc/init.qcom.sh | 57 ---------------------------------------- 2 files changed, 3 insertions(+), 97 deletions(-) diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc index 61f5da4d..26e37beb 100644 --- a/rootdir/etc/init.qcom.rc +++ b/rootdir/etc/init.qcom.rc @@ -549,47 +549,10 @@ service dhcpcd_bnep4 /system/bin/dhcpcd -BKLG disabled oneshot -service gpsone_daemon /system/bin/gpsone_daemon +service loc_launcher /system/bin/loc_launcher + #loc_launcher will start as root and set its uid to gps class late_start - user gps - group gps inet net_raw - disabled - -service quipc_igsn /system/bin/quipc_igsn - class late_start - user gps - group inet gps qcom_diag - disabled - -service quipc_main /system/bin/quipc_main - class late_start - user gps - group gps net_admin wifi inet qcom_diag - disabled - -service location_mq /system/bin/location-mq - class late_start - user gps - group gps - disabled - -service xtwifi_inet /system/bin/xtwifi-inet-agent - class late_start - user gps - group inet gps - disabled - -service xtwifi_client /system/bin/xtwifi-client - class late_start - user gps - group net_admin wifi inet gps - disabled - -service lowi-server /system/bin/lowi-server - class late_start - user gps - group gps net_admin wifi inet qcom_diag - disabled + group gps qcom_oncrpc inet net_raw qcom_diag net_admin wifi service fm_dl /system/bin/sh /system/etc/init.qcom.fm.sh class late_start diff --git a/rootdir/etc/init.qcom.sh b/rootdir/etc/init.qcom.sh index 16d699c8..d3f8cc14 100644 --- a/rootdir/etc/init.qcom.sh +++ b/rootdir/etc/init.qcom.sh @@ -84,9 +84,6 @@ start_charger_monitor() } baseband=`getprop ro.baseband` -izat_premium_enablement=`getprop ro.qc.sdk.izat.premium_enabled` -izat_service_mask=`getprop ro.qc.sdk.izat.service_mask` - # # Suppress default route installation during RA for IPV6; user space will take # care of this @@ -97,66 +94,12 @@ do done echo 1 > /proc/sys/net/ipv6/conf/default/accept_ra_defrtr -# -# Start gpsone_daemon for SVLTE Type I & II devices -# - -# platform id 126 is for MSM8974 -case "$platformid" in - "126") - start gpsone_daemon -esac -case "$target" in - "msm7630_fusion") - start gpsone_daemon -esac case "$baseband" in "svlte2a") - start gpsone_daemon start bridgemgrd ;; - "sglte" | "sglte2") - start gpsone_daemon - ;; esac -let "izat_service_gtp_wifi=$izat_service_mask & 2#1" -let "izat_service_gtp_wwan_lite=($izat_service_mask & 2#10)>>1" -let "izat_service_pip=($izat_service_mask & 2#100)>>2" - -if [ "$izat_premium_enablement" -ne 1 ]; then - if [ "$izat_service_gtp_wifi" -ne 0 ]; then -# GTP WIFI bit shall be masked by the premium service flag - let "izat_service_gtp_wifi=0" - fi -fi - -if [ "$izat_service_gtp_wwan_lite" -ne 0 ] || - [ "$izat_service_gtp_wifi" -ne 0 ] || - [ "$izat_service_pip" -ne 0 ]; then -# OS Agent would also be started under the same condition - start location_mq -fi - -if [ "$izat_service_gtp_wwan_lite" -ne 0 ] || - [ "$izat_service_gtp_wifi" -ne 0 ]; then -# start GTP services shared by WiFi and WWAN Lite - start xtwifi_inet - start xtwifi_client -fi - -if [ "$izat_service_gtp_wifi" -ne 0 ] || - [ "$izat_service_pip" -ne 0 ]; then -# advanced WiFi scan service shared by WiFi and PIP - start lowi-server -fi - -if [ "$izat_service_pip" -ne 0 ]; then -# PIP services - start quipc_main - start quipc_igsn -fi - start_sensors case "$target" in