From 9fc8fc369fe13bef10e1bd33d53c89b1deb2c034 Mon Sep 17 00:00:00 2001
From: Ethan Chen <intervigil@gmail.com>
Date: Sun, 1 Mar 2020 22:16:35 -0800
Subject: sdm660-common: Remove init.qcom.sensors scripting

* This device does not have sscrpcd, so the extra logic in the script is
  useless.
* The /persist/sensors directory and files already have their
  permissions set by init.qcom.rc during the early-boot phase.

Change-Id: I3ea825c7cd297fadd19cd56217ac0010a2f47089
---
 rootdir/Android.mk               |  8 -------
 rootdir/etc/init.qcom.rc         | 12 -----------
 rootdir/etc/init.qcom.sensors.sh | 45 ----------------------------------------
 sdm660.mk                        |  1 -
 4 files changed, 66 deletions(-)
 delete mode 100644 rootdir/etc/init.qcom.sensors.sh

diff --git a/rootdir/Android.mk b/rootdir/Android.mk
index 499275d..9c8d3ae 100644
--- a/rootdir/Android.mk
+++ b/rootdir/Android.mk
@@ -84,14 +84,6 @@ LOCAL_SRC_FILES    := etc/ueventd.qcom.rc
 LOCAL_MODULE_PATH  := $(TARGET_OUT_VENDOR)
 include $(BUILD_PREBUILT)
 
-include $(CLEAR_VARS)
-LOCAL_MODULE       := init.qcom.sensors.sh
-LOCAL_MODULE_TAGS  := optional
-LOCAL_MODULE_CLASS := ETC
-LOCAL_SRC_FILES    := etc/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
diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc
index 7867f9e..64ecb58 100644
--- a/rootdir/etc/init.qcom.rc
+++ b/rootdir/etc/init.qcom.rc
@@ -564,17 +564,10 @@ service qmiproxy /system/bin/qmiproxy
     group radio diag
     disabled
 
-service vendor.sensors /vendor/bin/sscrpcd sensorspd
-    class early_hal
-    user system
-    group system wakelock
-    capabilities BLOCK_SUSPEND
-
 service vendor.sensors.qti /vendor/bin/sensors.qti
     class core
     user system
     group system
-    disabled
 
 # Adjust socket buffer to enlarge TCP receive window for high bandwidth
 # but only if ro.data.large_tcp_window_size property is set.
@@ -692,11 +685,6 @@ service qcom-sh /vendor/bin/init.qcom.sh
     group root system radio
     oneshot
 
-service vendor-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/rootdir/etc/init.qcom.sensors.sh b/rootdir/etc/init.qcom.sensors.sh
deleted file mode 100644
index 978324e..0000000
--- a/rootdir/etc/init.qcom.sensors.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/vendor/bin/sh
-# Copyright (c) 2015,2018 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()
-{
-
-    # chmod -h 664 /persist/sensors/sensors_settings
-    # chown -h -R system.system /persist/sensors
-    start vendor.sensors.qti
-
-    # Only for SLPI
-    if [ -c /dev/msm_dsps -o -c /dev/sensors ] ; then
-        start vendor.sensors
-    fi
-}
-
-start_sensors
diff --git a/sdm660.mk b/sdm660.mk
index 7d15c4e..5223305 100644
--- a/sdm660.mk
+++ b/sdm660.mk
@@ -282,7 +282,6 @@ PRODUCT_PACKAGES += \
     init.qcom.early_boot.sh \
     init.qcom.post_boot.sh \
     init.qcom.rc \
-    init.qcom.sensors.sh \
     init.qcom.sh \
     init.qcom.usb.rc \
     init.qcom.usb.sh \
-- 
cgit v1.2.3