From 7b2d219e9c7e1cf69481e40c05264885a230990d Mon Sep 17 00:00:00 2001 From: Vachounet Date: Mon, 29 Jan 2018 20:17:10 +0100 Subject: [PATCH] sanders: fix FMRadio after enforcing * Use oss service * Set proper context Change-Id: I7bd58339bf2d9d37847961f9260eead785c14c5a --- device.mk | 3 +- rootdir/Android.mk | 9 ---- rootdir/etc/init.qcom.fm.sh | 90 ------------------------------------- rootdir/etc/init.qcom.rc | 2 +- sepolicy/file_contexts | 1 + 5 files changed, 4 insertions(+), 101 deletions(-) delete mode 100644 rootdir/etc/init.qcom.fm.sh diff --git a/device.mk b/device.mk index e7dc75a..c3dadf5 100644 --- a/device.mk +++ b/device.mk @@ -183,7 +183,8 @@ PRODUCT_PACKAGES += \ # FM PRODUCT_PACKAGES += \ FMRadio \ - libfmjni + libfmjni \ + init.qti.fm.sh # Gatekeeper HAL PRODUCT_PACKAGES += \ diff --git a/rootdir/Android.mk b/rootdir/Android.mk index 30e8f03..7c940ba 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -34,14 +34,6 @@ LOCAL_SRC_FILES := etc/wlan_carrier_bin.sh LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_EXECUTABLES) include $(BUILD_PREBUILT) -include $(CLEAR_VARS) -LOCAL_MODULE := init.qcom.fm.sh -LOCAL_MODULE_TAGS := optional eng -LOCAL_MODULE_CLASS := ETC -LOCAL_SRC_FILES := etc/init.qcom.fm.sh -LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC) -include $(BUILD_PREBUILT) - include $(CLEAR_VARS) LOCAL_MODULE := init.qcom.ril.sh LOCAL_MODULE_TAGS := optional eng @@ -51,7 +43,6 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_EXECUTABLES) include $(BUILD_PREBUILT) # Init scripts - include $(CLEAR_VARS) LOCAL_MODULE := fstab.qcom LOCAL_MODULE_TAGS := optional eng diff --git a/rootdir/etc/init.qcom.fm.sh b/rootdir/etc/init.qcom.fm.sh deleted file mode 100644 index b95f6ea..0000000 --- a/rootdir/etc/init.qcom.fm.sh +++ /dev/null @@ -1,90 +0,0 @@ -#!/system/bin/sh -# Copyright (c) 2009-2011, 2015, 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 The 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. -# - -setprop hw.fm.init 0 - -mode=`getprop hw.fm.mode` -version=199217 - -LOG_TAG="qcom-fm" -LOG_NAME="${0}:" - -loge () -{ - /system/bin/log -t $LOG_TAG -p e "$LOG_NAME $@" -} - -logi () -{ - /system/bin/log -t $LOG_TAG -p i "$LOG_NAME $@" -} - -failed () -{ - loge "$1: exit code $2" - exit $2 -} - -logi "In FM shell Script" -logi "mode: $mode" -logi "Version : $version" - -#$fm_qsoc_patches -# -case $mode in - "normal") - logi "inserting the radio transport module" - echo 1 > /sys/module/radio_iris_transport/parameters/fmsmd_set - /system/vendor/bin/fm_qsoc_patches $version 0 - ;; - "wa_enable") - /system/vendor/bin/fm_qsoc_patches $version 1 - ;; - "wa_disable") - /system/vendor/bin/fm_qsoc_patches $version 2 - ;; - *) - logi "Shell: Default case" - /system/vendor/bin/fm_qsoc_patches $version 0 - ;; -esac - -exit_code_fm_qsoc_patches=$? - -case $exit_code_fm_qsoc_patches in - 0) - logi "FM QSoC calibration and firmware download succeeded" - ;; - *) - failed "FM QSoC firmware download and/or calibration failed" $exit_code_fm_qsoc_patches - ;; -esac - -setprop hw.fm.init 1 - -exit 0 diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc index a888b4e..4a25934 100644 --- a/rootdir/etc/init.qcom.rc +++ b/rootdir/etc/init.qcom.rc @@ -808,7 +808,7 @@ service vendor.msm_irqbalance /vendor/bin/msm_irqbalance -f /system/vendor/etc/m user root group root -service fm_dl /system/bin/sh /system/vendor/etc/init.qcom.fm.sh +service fm_dl /vendor/bin/init.qti.fm.sh class late_start user system group system diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts index 47fbbe0..8ff1d05 100644 --- a/sepolicy/file_contexts +++ b/sepolicy/file_contexts @@ -10,6 +10,7 @@ /system/bin/charge_only_mode u:object_r:charge_only_exec:s0 /system/vendor/bin/init\.mmi\.boot\.sh u:object_r:mmi_boot_exec:s0 /system/vendor/bin/wlan_carrier_bin\.sh u:object_r:init_wifi_exec:s0 +/system/vendor/bin/init\.qti\.fm\.sh u:object_r:qti_init_shell_exec:s0 # CMActions /sys/homebutton(/.*)? u:object_r:sysfs_homebutton:s0