commit 10b235e7436256da9adc827125645f141bd8fac9
author Todd Poynor <toddpoynor@google.com> Wed Aug 07 15:25:14 2013 -0700
committer Todd Poynor <toddpoynor@google.com> Wed Aug 07 18:57:37 2013 -0700
tree 7a7d2708267de8c88b0693d9c69d5f298b2cc2a6
parent b45f1f5bd00c9a8380960d7c439eb14b3a334f50

healthd: add health HAL support

Adds board-specific battery monitoring capabilities:

* processing of battery property values and additional charging logic.
* adjusted (or removed) polling intervals.
* replaced (or removed) battery status heartbeat in kernel log.

Change-Id: Ia77bca8dc92c6c2a51afa65d516cacca08da73ac

healthd/BatteryMonitor.cpp

diff --git a/healthd/BatteryMonitor.cpp b/healthd/BatteryMonitor.cpp
index 882d514..8492dce 100644
--- a/healthd/BatteryMonitor.cpp
+++ b/healthd/BatteryMonitor.cpp
@@ -16,6 +16,7 @@
 
 #define LOG_TAG "healthd"
 
+#include "healthd.h"
 #include "BatteryMonitor.h"
 #include "BatteryPropertiesRegistrar.h"
 
@@ -170,6 +171,7 @@
 
 bool BatteryMonitor::update(void) {
     struct BatteryProperties props;
+    bool logthis;
 
     props.chargerAcOnline = false;
     props.chargerUsbOnline = false;
@@ -238,27 +240,31 @@
         }
     }
 
-    char dmesgline[256];
-    snprintf(dmesgline, sizeof(dmesgline),
-             "battery l=%d v=%d t=%s%d.%d h=%d st=%d",
-             props.batteryLevel, props.batteryVoltage,
-             props.batteryTemperature < 0 ? "-" : "",
-             abs(props.batteryTemperature / 10),
-             abs(props.batteryTemperature % 10), props.batteryHealth,
-             props.batteryStatus);
+    logthis = !healthd_board_battery_update(&props);
 
-    if (!mBatteryCurrentNowPath.isEmpty()) {
-        char b[20];
+    if (logthis) {
+        char dmesgline[256];
+        snprintf(dmesgline, sizeof(dmesgline),
+                 "battery l=%d v=%d t=%s%d.%d h=%d st=%d",
+                 props.batteryLevel, props.batteryVoltage,
+                 props.batteryTemperature < 0 ? "-" : "",
+                 abs(props.batteryTemperature / 10),
+                 abs(props.batteryTemperature % 10), props.batteryHealth,
+                 props.batteryStatus);
 
-        snprintf(b, sizeof(b), " c=%d", props.batteryCurrentNow);
-        strlcat(dmesgline, b, sizeof(dmesgline));
+        if (!mBatteryCurrentNowPath.isEmpty()) {
+            char b[20];
+
+            snprintf(b, sizeof(b), " c=%d", props.batteryCurrentNow);
+            strlcat(dmesgline, b, sizeof(dmesgline));
+        }
+
+        KLOG_INFO(LOG_TAG, "%s chg=%s%s%s\n", dmesgline,
+                  props.chargerAcOnline ? "a" : "",
+                  props.chargerUsbOnline ? "u" : "",
+                  props.chargerWirelessOnline ? "w" : "");
     }
 
-    KLOG_INFO(LOG_TAG, "%s chg=%s%s%s\n", dmesgline,
-              props.chargerAcOnline ? "a" : "",
-              props.chargerUsbOnline ? "u" : "",
-              props.chargerWirelessOnline ? "w" : "");
-
     if (mBatteryPropertiesRegistrar != NULL)
         mBatteryPropertiesRegistrar->notifyListeners(props);