summaryrefslogtreecommitdiffstats
path: root/healthd/BatteryMonitor.cpp
diff options
context:
space:
mode:
authorTodd Poynor <toddpoynor@google.com>2014-05-20 13:54:40 -0700
committerTodd Poynor <toddpoynor@google.com>2014-05-20 16:26:48 -0700
commite14b37eb07b394fef05da5ee09dc6d33e3a25711 (patch)
tree43d8cc8e73f7d04f566b766fe88461edb7672c87 /healthd/BatteryMonitor.cpp
parentb65208d1a98c4cc6b4fbae302f7718f056e2fadd (diff)
downloadsystem_core-e14b37eb07b394fef05da5ee09dc6d33e3a25711.tar.gz
system_core-e14b37eb07b394fef05da5ee09dc6d33e3a25711.tar.bz2
system_core-e14b37eb07b394fef05da5ee09dc6d33e3a25711.zip
healthd: Add hooks for ENERGY_COUNTER property
Bug: 10118565 Change-Id: Ibabae2a78a600ae37ce9b91da0f5980ee94b05c2
Diffstat (limited to 'healthd/BatteryMonitor.cpp')
-rw-r--r--healthd/BatteryMonitor.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/healthd/BatteryMonitor.cpp b/healthd/BatteryMonitor.cpp
index ac649ce78..4ee6249b9 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 @@ status_t BatteryMonitor::getProperty(int id, struct BatteryProperty *val) {
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: