diff options
| -rw-r--r-- | rootdir/Android.mk | 8 | ||||
| -rwxr-xr-x | rootdir/bin/init.qcom.sensors.sh | 43 | ||||
| -rwxr-xr-x | rootdir/etc/init.qcom.rc | 14 | ||||
| -rw-r--r-- | sepolicy/file_contexts | 3 | ||||
| -rw-r--r-- | wayne.mk | 1 |
5 files changed, 11 insertions, 58 deletions
diff --git a/rootdir/Android.mk b/rootdir/Android.mk index 4427d52..6a9f7eb 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -150,14 +150,6 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR) include $(BUILD_PREBUILT) include $(CLEAR_VARS) -LOCAL_MODULE := init.qcom.sensors.sh -LOCAL_MODULE_TAGS := optional eng -LOCAL_MODULE_CLASS := ETC -LOCAL_SRC_FILES := bin/init.qcom.sensors.sh -LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_EXECUTABLES) -include $(BUILD_PREBUILT) - -include $(CLEAR_VARS) LOCAL_MODULE := init.target.rc LOCAL_MODULE_TAGS := optional eng LOCAL_MODULE_CLASS := ETC diff --git a/rootdir/bin/init.qcom.sensors.sh b/rootdir/bin/init.qcom.sensors.sh deleted file mode 100755 index fd193e2..0000000 --- a/rootdir/bin/init.qcom.sensors.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/vendor/bin/sh -# Copyright (c) 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. -# - -# -# Function to start sensors for SSC enabled platforms -# -start_sensors() -{ - if [ -c /dev/msm_dsps -o -c /dev/sensors ]; then - chmod -h 775 /persist/sensors - chmod -h 664 /persist/sensors/sensors_settings - mkdir -p /persist/sensors/registry/registry - chown -h system.root /persist/sensors/sensors_settings - start sensors - fi -} - -start_sensors diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc index 21d2e5f..4524cac 100755 --- a/rootdir/etc/init.qcom.rc +++ b/rootdir/etc/init.qcom.rc @@ -349,6 +349,14 @@ on post-fs-data mkdir /data/fota 0771 chown system system /data/fota + # SSC/SLPI sensors + mkdir /persist/sensors 0775 sensors sensors + write /persist/sensors/sensors_settings 1 + chown system root /persist/sensors/sensors_settings + chmod 0664 /persist/sensors/sensors_settings + chown system system /persist/PRSensorData.txt + chmod 0600 /persist/PRSensorData.txt + #Create directory for hostapd mkdir /data/hostapd 0770 system wifi @@ -678,7 +686,6 @@ service sensors /vendor/bin/sensors.qcom class core user root group root - disabled on property:ro.use_data_netmgrd=false # netmgr not supported on specific target @@ -924,11 +931,6 @@ service qcom-sh /vendor/bin/init.qcom.sh user root oneshot -service sensor-sh /vendor/bin/init.qcom.sensors.sh - class core - user root - oneshot - service crashdata-sh /vendor/bin/init.qcom.crashdata.sh class late_start user root diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts index 2d50c7b..19975c3 100644 --- a/sepolicy/file_contexts +++ b/sepolicy/file_contexts @@ -23,5 +23,8 @@ # Mlipay /(vendor|system/vendor)/bin/mlipayd u:object_r:hal_mlipay_default_exec:s0 +# Persist +/persist/PRSensorData\.txt u:object_r:sensors_persist_file:s0 + # Shell Script /(vendor|system/vendor)/bin/init\.goodix\.sh u:object_r:init_fingerprint_exec:s0 @@ -271,7 +271,6 @@ PRODUCT_PACKAGES += \ init.qcom.efs.sync.sh \ init.qcom.post_boot.sh \ init.qcom.rc \ - init.qcom.sensors.sh \ init.qcom.sh \ init.qcom.sdio.sh \ init.qcom.syspart_fixup.sh \ |