commit dfeb26bb089142370f617f9e20bd163b2e6b425e
author Yueyao Zhu <yueyao@google.com> Wed Jun 21 19:35:39 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jun 21 19:35:39 2017 +0000
tree 70a87c2c14c1e73aeae9024ff2c0966b5754adf1
parent 5ab73be55c47c93f68d933d18299de8ff90139b4
parent 9e32882f471dafb44b3ee98146b5ee468929a8b4

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

Change-Id: Iebda9e1b57fb47f85ba5fd761fae03a4a6c77624

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