diff --git a/common.mk b/common.mk index 42c4112a..2c5531ab 100644 --- a/common.mk +++ b/common.mk @@ -209,7 +209,6 @@ INIT += init.class_main.sh INIT += init.qcom.wifi.sh INIT += vold.fstab INIT += init.qcom.ril.path.sh -INIT += init.qcom.ril.sh INIT += init.qcom.usb.rc INIT += init.qcom.usb.sh INIT += usf_post_boot.sh diff --git a/rootdir/Android.mk b/rootdir/Android.mk index 2afd1a44..3d6fc506 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -121,14 +121,6 @@ LOCAL_SRC_FILES := etc/init.class_main.sh LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT) include $(BUILD_PREBUILT) -include $(CLEAR_VARS) -LOCAL_MODULE := init.qcom.ril.sh -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := ETC -LOCAL_SRC_FILES := etc/init.qcom.ril.sh -LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT) -include $(BUILD_PREBUILT) - include $(CLEAR_VARS) LOCAL_MODULE := init.qcom.usb.rc LOCAL_MODULE_TAGS := optional eng diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc index 5e6e1ae6..721aa723 100644 --- a/rootdir/etc/init.qcom.rc +++ b/rootdir/etc/init.qcom.rc @@ -57,8 +57,6 @@ on early-boot setrlimit 8 67108864 67108864 # Allow subsystem (modem etc) debugging write /sys/module/subsystem_restart/parameters/enable_debug ${persist.sys.ssr.enable_debug} - exec /system/bin/sh /init.qcom.early_boot.sh ${ro.board.platform} - exec /system/bin/sh /init.qcom.syspart_fixup.sh ${ro.board.platform} ${ro.serialno} on boot chown bluetooth bluetooth /sys/module/bluetooth_power/parameters/power @@ -276,11 +274,6 @@ service qcom-c_main-sh /system/bin/sh /init.class_main.sh user root oneshot -service ril-qmi /system/bin/sh /init.qcom.ril.sh - class main - user root - oneshot - on property:vold.decrypt=trigger_restart_framework start qcom-c_main-sh start config_bluetooth @@ -579,10 +572,6 @@ on property:crypto.driver.load=1 insmod /system/lib/modules/qce.ko insmod /system/lib/modules/qcedev.ko -on property:crypto.driver.load=0 - exec /system/bin/rmmod qcedev.ko - exec /system/bin/rmmod qce.ko - service drmdiag /system/bin/drmdiagapp class late_start user root @@ -707,10 +696,6 @@ service ssr_diag /system/bin/ssr_diag user system group system -# SSR setting -on property:persist.sys.ssr.restart_level=* - exec /system/bin/sh /init.qcom.ssr.sh ${persist.sys.ssr.restart_level} - # Define fastmmi service fastmmi /system/bin/mmi user root diff --git a/rootdir/etc/init.qcom.ril.sh b/rootdir/etc/init.qcom.ril.sh deleted file mode 100755 index 7dc519be..00000000 --- a/rootdir/etc/init.qcom.ril.sh +++ /dev/null @@ -1,60 +0,0 @@ -#!/system/bin/sh -# Copyright (c) 2013, The Linux Foundation. All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# * Neither the name of Linux Foundation nor -# the names of its contributors may be used to endorse or promote -# products derived from this software without specific prior written -# permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -# NON-INFRINGEMENT ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR -# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -carrier=`getprop persist.env.spec` -if [ "$carrier" = "ChinaTelecom" ]; then - # Update the props. - setprop persist.env.phone.global true - setprop persist.env.plmn.update true - - # Remount /system with read-write permission for copy action. - `mount -o remount,rw /system` - - # Copy the modules to system app. - `cp /system/vendor/ChinaTelecom/system/app/RoamingSettings.apk /system/app/RoamingSettings.apk` - `cp /system/vendor/ChinaTelecom/system/app/UniversalDownload.apk /system/app/UniversalDownload.apk` - `chmod -h 644 /system/app/RoamingSettings.apk` - `chmod -h 644 /system/app/UniversalDownload.apk` - - # Remount /system with read-only - `mount -o remount,ro /system` -else - # Update the props. - setprop persist.env.phone.global false - setprop persist.env.plmn.update false - - # Remount /system with read-write permission for remove action. - `mount -o remount,rw /system` - - # Remove the modules from the system app. - `rm /system/app/RoamingSettings.apk` - `rm /system/app/UniversalDownload.apk` - - # Remount /system with read-only - `mount -o remount,ro /system` -fi