From 80c8b0763602bb0eccfcd10557df852550a23e58 Mon Sep 17 00:00:00 2001
From: Stephane Lee <stayfan@google.com>
Date: Thu, 13 May 2021 14:37:35 -0700
Subject: [PATCH] Enable Battery Defender on gs101

Bug: 188110823
Test: Ensure that Dwell-Defend can trigger with 'setprop
vendor.battery.defender.threshold 61'

Change-Id: I4782e2c387b147fc48cf4134d27af8675964dc44
---
 conf/init.gs101.rc | 9 +++------
 health/Health.cpp  | 4 +++-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/conf/init.gs101.rc b/conf/init.gs101.rc
index 1952f1c5..59fdba8b 100644
--- a/conf/init.gs101.rc
+++ b/conf/init.gs101.rc
@@ -454,6 +454,9 @@ on fs
     restorecon_recursive /mnt/vendor/modem_userdata
     chown radio system /mnt/vendor/modem_userdata
 
+    # for cycle count backup
+    mkdir /mnt/vendor/persist/battery 0700 system system
+
     restorecon_recursive /mnt/vendor/persist
     restorecon_recursive /mnt/vendor/persist/aoc
     restorecon_recursive /mnt/vendor/persist/audio
@@ -737,12 +740,6 @@ on  property:persist.sys.test_harness=1 && property:persist.vendor.testing_batte
     setprop persist.vendor.charge.start.level 0
     setprop vendor.battery.defender.disable 1
 
-on property:persist.vendor.charge.stop.level=*
-    write /sys/devices/platform/google,charger/charge_stop_level ${persist.vendor.charge.stop.level}
-
-on property:persist.vendor.charge.start.level=*
-    write /sys/devices/platform/google,charger/charge_start_level ${persist.vendor.charge.start.level}
-
 service insmod_sh_common /vendor/bin/init.insmod.sh /vendor/etc/init.insmod.gs101.cfg
     class main
     user root
diff --git a/health/Health.cpp b/health/Health.cpp
index f2b57be3..f191fbfe 100644
--- a/health/Health.cpp
+++ b/health/Health.cpp
@@ -64,7 +64,9 @@ constexpr char kVoltageAvg[] {FG_DIR "/voltage_now"};
 
 #define WLC_DIR "/sys/class/power_supply/wireless"
 
-static BatteryDefender battDefender(WLC_DIR "/present");
+static BatteryDefender battDefender(WLC_DIR "/present",
+    "/sys/devices/platform/google,charger/charge_start_level",
+    "/sys/devices/platform/google,charger/charge_stop_level");
 static BatteryThermalControl battThermalControl(
     "dev/thermal/tz-by-name/soc/mode");
 static BatteryMetricsLogger battMetricsLogger(kBatteryResistance, kBatteryOCV);