summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordianlujitao <dianlujitao@lineageos.org>2020-02-01 23:38:29 +0800
committerMichael Bestas <mkbestas@lineageos.org>2020-04-30 00:48:54 +0300
commit5d639aa1bdf8cb642c23207b181e5a897011cedf (patch)
tree5452abd2b18f391c4e469b2f9a60d20c6f9258f6
parent7f63be6f6311169b3e0ac4bbd236b0a989b17e65 (diff)
Revert "wayne: Delete goodix data if other slot is taking up space"
This reverts commit 25b47ac236e89800524f57b8176fe91d30d87f2d. Change-Id: I34ef8d2ff4e5373719eb61b63b94087bbb411494
-rw-r--r--biometrics/android.hardware.biometrics.fingerprint@2.1-service.xiaomi_sdm660.rc8
-rw-r--r--rootdir/Android.mk8
-rwxr-xr-xrootdir/bin/init.goodix.sh32
-rw-r--r--sdm660.mk1
4 files changed, 0 insertions, 49 deletions
diff --git a/biometrics/android.hardware.biometrics.fingerprint@2.1-service.xiaomi_sdm660.rc b/biometrics/android.hardware.biometrics.fingerprint@2.1-service.xiaomi_sdm660.rc
index bd3e2ce..f789014 100644
--- a/biometrics/android.hardware.biometrics.fingerprint@2.1-service.xiaomi_sdm660.rc
+++ b/biometrics/android.hardware.biometrics.fingerprint@2.1-service.xiaomi_sdm660.rc
@@ -26,11 +26,3 @@ service vendor.fps_hal /vendor/bin/hw/android.hardware.biometrics.fingerprint@2.
class late_start
user system
group system uhid input
-
-service vendor.goodix_script /vendor/bin/init.goodix.sh
- class late_start
- user system
- disabled
-
-on property:ro.boot.fpsensor=gdx
- start vendor.goodix_script
diff --git a/rootdir/Android.mk b/rootdir/Android.mk
index 1d50930..ddffd59 100644
--- a/rootdir/Android.mk
+++ b/rootdir/Android.mk
@@ -83,11 +83,3 @@ LOCAL_MODULE_CLASS := ETC
LOCAL_SRC_FILES := etc/init.target.rc
LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC)/init/hw
include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := init.goodix.sh
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := ETC
-LOCAL_SRC_FILES := bin/init.goodix.sh
-LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_EXECUTABLES)
-include $(BUILD_PREBUILT)
diff --git a/rootdir/bin/init.goodix.sh b/rootdir/bin/init.goodix.sh
deleted file mode 100755
index cb019c5..0000000
--- a/rootdir/bin/init.goodix.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#! /vendor/bin/sh
-
-# Copyright (c) 2009-2016, 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.
-#
-
-if [ ! -f /data/system/users/0/settings_fingerprint.xml ]; then
- rm -rf /mnt/vendor/persist/data/finger_*
-fi
diff --git a/sdm660.mk b/sdm660.mk
index 7e1c880..dcf272e 100644
--- a/sdm660.mk
+++ b/sdm660.mk
@@ -262,7 +262,6 @@ PRODUCT_COPY_FILES += \
# Init
PRODUCT_PACKAGES += \
init.class_main.sh \
- init.goodix.sh \
init.msm.usb.configfs.rc \
init.qcom.post_boot.sh \
init.qcom.sensors.sh \