From 856fd64d7ba10d3385b52eb10c5ac455b5d34f28 Mon Sep 17 00:00:00 2001
From: Sebastiano Barezzi <seba@sebaubuntu.dev>
Date: Thu, 30 May 2024 19:28:43 +0200
Subject: [PATCH] sm8450-common: Partially revert "Move to QTI health AIDL
 service"

https://github.com/LineageOS/android_system_core/blob/lineage-21.0/init/init.cpp#L1099

This partially reverts commit 2d6f07b00c3753e35b4cd8ae557478d443f99314.

Change-Id: I284f80f364e9057a8373a015f0acaee3ef9e395d
---
 extract-files.sh               | 3 ---
 rootdir/etc/init.qcom.rc       | 2 +-
 rootdir/etc/init.qti.kernel.rc | 2 +-
 rootdir/etc/init.target.rc     | 2 +-
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/extract-files.sh b/extract-files.sh
index b9227ed..9ad271c 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -67,9 +67,6 @@ function blob_fixup() {
         vendor/bin/hw/android.hardware.security.keymint-service-qti|vendor/lib/libqtikeymint.so|vendor/lib64/libqtikeymint.so)
             grep -q "android.hardware.security.rkp-V3-ndk.so" "${2}" || "${PATCHELF_0_17_2}" --add-needed "android.hardware.security.rkp-V3-ndk.so" "${2}"
             ;;
-        vendor/etc/init/hw/init.mi_thermald.rc|vendor/etc/init/hw/init.qcom.usb.rc|vendor/etc/init/hw/init.qti.kernel.rc)
-            sed -i 's/on charger/on property:init.svc.vendor.charger=running/g' "${2}"
-            ;;
         vendor/etc/init/init.embmssl_server.rc)
             sed -i -n '/interface/!p' "${2}"
             ;;
diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc
index 3bd5c57..755afe6 100644
--- a/rootdir/etc/init.qcom.rc
+++ b/rootdir/etc/init.qcom.rc
@@ -803,7 +803,7 @@ service esepmdaemon /system/vendor/bin/esepmdaemon
     user system
     group nfc
 
-on property:init.svc.vendor.charger=running
+on charger
     setprop persist.sys.usb.config mass_storage
     start qcom-post-boot
 
diff --git a/rootdir/etc/init.qti.kernel.rc b/rootdir/etc/init.qti.kernel.rc
index 420f146..15de3a8 100644
--- a/rootdir/etc/init.qti.kernel.rc
+++ b/rootdir/etc/init.qti.kernel.rc
@@ -167,7 +167,7 @@ on property:sys.boot_completed=1
     start kernel-boot
     start kernel-post-boot
 
-on property:init.svc.vendor.charger=running
+on charger
     start kernel-post-boot
 
 service vendor.msm_irqbalance /vendor/bin/msm_irqbalance -f /system/vendor/etc/msm_irqbalance.conf
diff --git a/rootdir/etc/init.target.rc b/rootdir/etc/init.target.rc
index 968307c..f6ceea8 100644
--- a/rootdir/etc/init.target.rc
+++ b/rootdir/etc/init.target.rc
@@ -129,7 +129,7 @@ on init && property:ro.boot.mode=charger
     wait /sys/kernel/boot_adsp/boot
     write /sys/kernel/boot_adsp/boot 1
 
-on property:init.svc.vendor.charger=running
+on charger
     start vendor.power_off_alarm
     setprop sys.usb.controller a600000.dwc3
     wait /sys/class/udc/${sys.usb.controller}