From 4aca996701ea82f0d8dbe1b26715354442d166ab Mon Sep 17 00:00:00 2001
From: Bruno Martins <bgcngm@gmail.com>
Date: Mon, 13 Nov 2023 13:48:00 +0000
Subject: [PATCH] sm8350-common: Move to QTI health AIDL service

The health AIDL HAL service provides functionalities of charger,
therefore system charger at /system/bin/charger is deprecated.
On top of that, QTI health AIDL HAL service enables suspend by
default, the equivalent of setting ro.charger.enable_suspend
for legacy charger.

Change-Id: I59c23e7974cea1174b0161f31a535fa3afa1e5c9
---
 common.mk                         | 3 +--
 rootdir/etc/init.batterysecret.rc | 2 +-
 rootdir/etc/init.mi_thermald.rc   | 2 +-
 rootdir/etc/init.qcom.rc          | 7 -------
 rootdir/etc/init.qcom.usb.rc      | 2 +-
 rootdir/etc/init.target.rc        | 2 +-
 system.prop                       | 3 ---
 7 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/common.mk b/common.mk
index 3dbcca5..b35e0dc 100644
--- a/common.mk
+++ b/common.mk
@@ -233,8 +233,7 @@ PRODUCT_COPY_FILES += \
 
 # Health
 PRODUCT_PACKAGES += \
-    android.hardware.health@2.1-impl-qti \
-    android.hardware.health@2.1-service
+    android.hardware.health-service.qti
 
 PRODUCT_PACKAGES += \
     libhidltransport.vendor \
diff --git a/rootdir/etc/init.batterysecret.rc b/rootdir/etc/init.batterysecret.rc
index d0b9cf7..37389a0 100644
--- a/rootdir/etc/init.batterysecret.rc
+++ b/rootdir/etc/init.batterysecret.rc
@@ -18,7 +18,7 @@ on property:sys.boot_completed=1
     start batterysecret
 
 #run batterysecret in off-charge mode
-on charger
+on property:init.svc.vendor.charger=running
     start batterysecret
     chmod 0664 /sys/class/qcom-battery/pd_verifed
     chmod 0664 /sys/class/qcom-battery/request_vdm_cmd
diff --git a/rootdir/etc/init.mi_thermald.rc b/rootdir/etc/init.mi_thermald.rc
index a62a5fe..e14a098 100644
--- a/rootdir/etc/init.mi_thermald.rc
+++ b/rootdir/etc/init.mi_thermald.rc
@@ -1,4 +1,4 @@
-on charger
+on property:init.svc.vendor.charger=running
     wait /sys/class/power_supply/usb/type
     start mi_thermald
 on boot
diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc
index 5f55d59..b4b4c39 100644
--- a/rootdir/etc/init.qcom.rc
+++ b/rootdir/etc/init.qcom.rc
@@ -291,13 +291,6 @@ service vendor.atfwd /vendor/bin/ATFWD-daemon
     user system
     group system radio
 
-service charger /system/bin/charger
-    class charger
-    user system
-    group system graphics input
-    capabilities SYS_BOOT
-    seclabel u:r:charger:s0
-
 service vendor.power_off_alarm /vendor/bin/power_off_alarm
     class core
     group system
diff --git a/rootdir/etc/init.qcom.usb.rc b/rootdir/etc/init.qcom.usb.rc
index 279766b..638e614 100644
--- a/rootdir/etc/init.qcom.usb.rc
+++ b/rootdir/etc/init.qcom.usb.rc
@@ -25,7 +25,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-on charger
+on property:init.svc.vendor.charger=running
     mkdir /config/usb_gadget/g1 0770
     mkdir /config/usb_gadget/g1/strings/0x409 0770
 
diff --git a/rootdir/etc/init.target.rc b/rootdir/etc/init.target.rc
index 246acec..73e3d33 100644
--- a/rootdir/etc/init.target.rc
+++ b/rootdir/etc/init.target.rc
@@ -168,7 +168,7 @@ on init && property:ro.boot.mode=charger
     write /sys/kernel/boot_adsp/boot 1
     wait /sys/class/power_supply/battery
 
-on charger
+on property:init.svc.vendor.charger=running
     start vendor.power_off_alarm
     setprop sys.usb.controller a600000.dwc3
     setprop sys.usb.configfs 1
diff --git a/system.prop b/system.prop
index 47a631f..a38e81d 100644
--- a/system.prop
+++ b/system.prop
@@ -1,9 +1,6 @@
 # Bluetooth
 vendor.bluetooth.soc=hastings
 
-# Charger
-ro.charger.enable_suspend=true
-
 # CNE
 persist.vendor.cne.feature=1