From 802ced871ccbaa53830b9fb0ade4d7f0c2a611ea Mon Sep 17 00:00:00 2001
From: Bruno Martins <bgcngm@gmail.com>
Date: Mon, 13 Nov 2023 13:48:00 +0000
Subject: [PATCH] Spacewar: 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
---
 device.mk                  | 3 +--
 properties/system.prop     | 3 ---
 rootdir/etc/init.qcom.rc   | 9 +--------
 rootdir/etc/init.target.rc | 2 +-
 4 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/device.mk b/device.mk
index 5e27372..1ce9fda 100644
--- a/device.mk
+++ b/device.mk
@@ -210,8 +210,7 @@ PRODUCT_PACKAGES += \
 
 # Health
 PRODUCT_PACKAGES += \
-    android.hardware.health@2.1-impl-qti \
-    android.hardware.health@2.1-service
+    android.hardware.health-service.qti
 
 # HotwordEnrollement
 PRODUCT_COPY_FILES += \
diff --git a/properties/system.prop b/properties/system.prop
index 7756651..1f8f783 100644
--- a/properties/system.prop
+++ b/properties/system.prop
@@ -7,9 +7,6 @@ persist.vendor.bluetooth.modem_nv_support=true
 # Camera
 camera.disable_zsl_mode=true
 
-# Charger
-ro.charger.enable_suspend=1
-
 # CNE
 persist.vendor.cne.feature=1
 
diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc
index 96fed19..a986e0f 100644
--- a/rootdir/etc/init.qcom.rc
+++ b/rootdir/etc/init.qcom.rc
@@ -666,13 +666,6 @@ service profiler_daemon /system/bin/profiler_daemon
     group root
     disabled
 
-service charger /system/bin/charger
-    class charger
-    user system
-    group system graphics input
-    capabilities SYS_BOOT
-    seclabel u:r:charger:s0
-
 service vendor.ssr_diag /system/vendor/bin/ssr_diag
     class late_start
     user system
@@ -722,7 +715,7 @@ service esepmdaemon /system/vendor/bin/esepmdaemon
     user system
     group nfc
 
-on charger
+on property:init.svc.vendor.charger=running
     setprop persist.sys.usb.config mass_storage
     start qcom-post-boot
 
diff --git a/rootdir/etc/init.target.rc b/rootdir/etc/init.target.rc
index dbcd00f..2219496 100644
--- a/rootdir/etc/init.target.rc
+++ b/rootdir/etc/init.target.rc
@@ -275,7 +275,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