commit 9e32882f471dafb44b3ee98146b5ee468929a8b4
author Yueyao Zhu <yueyao@google.com> Wed Jun 21 19:33:12 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jun 21 19:33:12 2017 +0000
tree 6f55de2b3f0e285c99cd890768ab730780cd8109
parent fb5ed697e2d91dc38a3912e76a4ea27e2d907915
parent 8e5671f55c3293011c7cc2f5df5bea7f2d43a50d

Merge "healthd: add battery health status values from JEITA spec" am: 5dd87c4ef6 am: 7a79592e4e
am: 8e5671f55c

Change-Id: I9bda46d540f017393a740639c755b3a19b7dc758

healthd/BatteryMonitor.cpp

diff --git a/healthd/BatteryMonitor.cpp b/healthd/BatteryMonitor.cpp
index d26530b..676ee41 100644
--- a/healthd/BatteryMonitor.cpp
+++ b/healthd/BatteryMonitor.cpp
@@ -116,6 +116,10 @@
         { "Over voltage", BATTERY_HEALTH_OVER_VOLTAGE },
         { "Unspecified failure", BATTERY_HEALTH_UNSPECIFIED_FAILURE },
         { "Cold", BATTERY_HEALTH_COLD },
+        // battery health values from JEITA spec
+        { "Warm", BATTERY_HEALTH_GOOD },
+        { "Cool", BATTERY_HEALTH_GOOD },
+        { "Hot", BATTERY_HEALTH_OVERHEAT },
         { NULL, 0 },
     };