BatteryDefender: Set thresholds for all devices to 70/80

Bug: 175614345
Test: 'atest HealthTestCases'
Merged-In: Ieffaa391d491a2e395586e6215f3d6e8fdd5b92c
Change-Id: Ieffaa391d491a2e395586e6215f3d6e8fdd5b92c
(cherry picked from commit 4cf4b4d188a28a348042501d58c2c3bffb8e0786)
diff --git a/health/include/pixelhealth/BatteryDefender.h b/health/include/pixelhealth/BatteryDefender.h
index 31b410d..acb1aba 100644
--- a/health/include/pixelhealth/BatteryDefender.h
+++ b/health/include/pixelhealth/BatteryDefender.h
@@ -37,8 +37,8 @@
 const uint32_t DEFAULT_TIME_TO_CLEAR_SECONDS = (5 * ONE_MIN_IN_SECONDS);
 const int DEFAULT_CHARGE_LEVEL_START = 0;
 const int DEFAULT_CHARGE_LEVEL_STOP = 100;
-const int DEFAULT_CHARGE_LEVEL_DEFENDER_START = 60;
-const int DEFAULT_CHARGE_LEVEL_DEFENDER_STOP = 70;
+const int DEFAULT_CHARGE_LEVEL_DEFENDER_START = 70;
+const int DEFAULT_CHARGE_LEVEL_DEFENDER_STOP = 80;
 const int DEFAULT_CAPACITY_LEVEL = 100;
 
 class BatteryDefender {
diff --git a/health/test/TestBatteryDefender.cpp b/health/test/TestBatteryDefender.cpp
index 60a30f1..6058440 100644
--- a/health/test/TestBatteryDefender.cpp
+++ b/health/test/TestBatteryDefender.cpp
@@ -319,8 +319,8 @@
     testvar_systemTimeSecs += 0;
     battDefender.update(&props);
 
-    EXPECT_CALL(*mock, WriteStringToFile(std::to_string(60), kPathStartLevel, _));
-    EXPECT_CALL(*mock, WriteStringToFile(std::to_string(70), kPathStopLevel, _));
+    EXPECT_CALL(*mock, WriteStringToFile(std::to_string(70), kPathStartLevel, _));
+    EXPECT_CALL(*mock, WriteStringToFile(std::to_string(80), kPathStopLevel, _));
     EXPECT_CALL(*mock, SetProperty(kPropBatteryDefenderState, "ACTIVE"));
     testvar_systemTimeSecs += DEFAULT_TIME_TO_ACTIVATE_SECONDS + 1;
     battDefender.update(&props);
@@ -336,8 +336,8 @@
 
     InSequence s;
 
-    EXPECT_CALL(*mock, WriteStringToFile(std::to_string(60), kPathStartLevel, _));
-    EXPECT_CALL(*mock, WriteStringToFile(std::to_string(70), kPathStopLevel, _));
+    EXPECT_CALL(*mock, WriteStringToFile(std::to_string(70), kPathStartLevel, _));
+    EXPECT_CALL(*mock, WriteStringToFile(std::to_string(80), kPathStopLevel, _));
     EXPECT_CALL(*mock, SetProperty(kPropBatteryDefenderState, "ACTIVE"));
     battDefender.update(&props);
 }