commit 8e5671f55c3293011c7cc2f5df5bea7f2d43a50d
author Yueyao Zhu <yueyao@google.com> Wed Jun 21 19:29:25 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jun 21 19:29:25 2017 +0000
tree 063c75d04e85e9d1e210d5516a68d01761789c9f
parent e6699f4507e84b108f9c35725b4451f8100bea42
parent 7a79592e4e3fec25c0bdbc1e59246e5eea0f0d00

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

Change-Id: Ife13b29af4f44d3d6f5cc7b00435f4c6a57e0d2b

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 },
     };