commit e14b37eb07b394fef05da5ee09dc6d33e3a25711
author Todd Poynor <toddpoynor@google.com> Tue May 20 13:54:40 2014 -0700
committer Todd Poynor <toddpoynor@google.com> Tue May 20 16:26:48 2014 -0700
tree 43d8cc8e73f7d04f566b766fe88461edb7672c87
parent b65208d1a98c4cc6b4fbae302f7718f056e2fadd

healthd: Add hooks for ENERGY_COUNTER property

Bug: 10118565
Change-Id: Ibabae2a78a600ae37ce9b91da0f5980ee94b05c2

healthd/BatteryMonitor.cpp

diff --git a/healthd/BatteryMonitor.cpp b/healthd/BatteryMonitor.cpp
index ac649ce..4ee6249 100644
--- a/healthd/BatteryMonitor.cpp
+++ b/healthd/BatteryMonitor.cpp
@@ -27,6 +27,7 @@
 #include <unistd.h>
 #include <batteryservice/BatteryService.h>
 #include <cutils/klog.h>
+#include <sys/types.h>
 #include <utils/Errors.h>
 #include <utils/String8.h>
 #include <utils/Vector.h>
@@ -315,7 +316,11 @@
         break;
 
     case BATTERY_PROP_ENERGY_COUNTER:
-        ret = NAME_NOT_FOUND;
+        if (mHealthdConfig->energyCounter) {
+            ret = mHealthdConfig->energyCounter(&val->valueInt64);
+        } else {
+            ret = NAME_NOT_FOUND;
+        }
         break;
 
     default:

healthd/healthd.cpp

diff --git a/healthd/healthd.cpp b/healthd/healthd.cpp
index 5fe2965..a1912f1 100644
--- a/healthd/healthd.cpp
+++ b/healthd/healthd.cpp
@@ -52,6 +52,7 @@
     .batteryCurrentNowPath = String8(String8::kEmptyString),
     .batteryCurrentAvgPath = String8(String8::kEmptyString),
     .batteryChargeCounterPath = String8(String8::kEmptyString),
+    .energyCounter = NULL,
 };
 
 static int eventct;

healthd/healthd.h

diff --git a/healthd/healthd.h b/healthd/healthd.h
index 23a54bf..972e728 100644
--- a/healthd/healthd.h
+++ b/healthd/healthd.h
@@ -18,6 +18,7 @@
 #define _HEALTHD_H_
 
 #include <batteryservice/BatteryService.h>
+#include <sys/types.h>
 #include <utils/Errors.h>
 #include <utils/String8.h>
 
@@ -64,6 +65,8 @@
     android::String8 batteryCurrentNowPath;
     android::String8 batteryCurrentAvgPath;
     android::String8 batteryChargeCounterPath;
+
+    int (*energyCounter)(int64_t *);
 };
 
 // Global helper functions