From cf10d879d0c69c8bc35b72f4e5d3b970619ba99a Mon Sep 17 00:00:00 2001 From: "Kevin F. Haggerty" Date: Mon, 15 Jan 2018 08:34:38 -0700 Subject: [PATCH] klte-common: Drop the hacky deferred initcalls trigger script * Yes, I could do the sepolicy that lets this run correctly, but why? Even if the phone takes 0.5s longer to boot, will you really even notice? We are going to disable the deferred initcalls in the kernel and let it do its thing the more "normal" way. Change-Id: I2a9c50f12f4309923f3cdf6e646cad8edf717560 --- klte.mk | 1 - rootdir/Android.mk | 7 ------- rootdir/etc/init.qcom.rc | 5 ----- rootdir/etc/init.sec.boot.sh | 4 ---- 4 files changed, 17 deletions(-) delete mode 100644 rootdir/etc/init.sec.boot.sh diff --git a/klte.mk b/klte.mk index 829c03e..d4a4702 100644 --- a/klte.mk +++ b/klte.mk @@ -107,7 +107,6 @@ PRODUCT_PACKAGES += \ fstab.qcom \ init.qcom.rc \ init.qcom.usb.rc \ - init.sec.boot.sh \ ueventd.qcom.rc # Thermal diff --git a/rootdir/Android.mk b/rootdir/Android.mk index 61b4790..9ce26b3 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -32,10 +32,3 @@ LOCAL_MODULE_CLASS := ETC LOCAL_SRC_FILES := etc/ueventd.qcom.rc LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT) include $(BUILD_PREBUILT) - -include $(CLEAR_VARS) -LOCAL_MODULE := init.sec.boot.sh -LOCAL_MODULE_TAGS := optional eng -LOCAL_MODULE_CLASS := ETC -LOCAL_SRC_FILES := etc/init.sec.boot.sh -include $(BUILD_PREBUILT) diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc index 4bb643b..be7d7e4 100644 --- a/rootdir/etc/init.qcom.rc +++ b/rootdir/etc/init.qcom.rc @@ -1010,11 +1010,6 @@ service charger /charger class charger seclabel u:r:charger:s0 -service sec-sh /system/bin/sh /system/etc/init.sec.boot.sh - class main - user root - oneshot - on property:persist.sys.ssr.restart_level=1 write /sys/module/subsystem_restart/parameters/restart_level 1 diff --git a/rootdir/etc/init.sec.boot.sh b/rootdir/etc/init.sec.boot.sh deleted file mode 100644 index 8d0c8d4..0000000 --- a/rootdir/etc/init.sec.boot.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/system/bin/sh - -# start deferred initcalls -cat /proc/deferred_initcalls