summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRuchi Kandoi2015-08-25 19:22:11 -0500
committerAndroid Git Automerger2015-08-25 19:22:11 -0500
commit9e8eb9930b39638f7a7fff6b02a86906430cb76f (patch)
treec529aa66cf31706e3c5bdff0c1efc2bb1f27237f /healthd/healthd.cpp
parent361d16e7079e4b6e1c27df3f8ccc98b67b74a62f (diff)
parent62729a1d195cd27b353da24be21bd0a855884431 (diff)
downloadplatform-system-core-9e8eb9930b39638f7a7fff6b02a86906430cb76f.tar.gz
platform-system-core-9e8eb9930b39638f7a7fff6b02a86906430cb76f.tar.xz
platform-system-core-9e8eb9930b39638f7a7fff6b02a86906430cb76f.zip
am 62729a1d: am 565e4c6a: Merge "healthd: Adds cycle_count, current_now and full_charge properties."
* commit '62729a1d195cd27b353da24be21bd0a855884431': healthd: Adds cycle_count, current_now and full_charge properties.
Diffstat (limited to 'healthd/healthd.cpp')
-rw-r--r--healthd/healthd.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/healthd/healthd.cpp b/healthd/healthd.cpp
index b0002cc95..85888c3ca 100644
--- a/healthd/healthd.cpp
+++ b/healthd/healthd.cpp
@@ -52,6 +52,8 @@ static struct healthd_config healthd_config = {
52 .batteryCurrentNowPath = String8(String8::kEmptyString), 52 .batteryCurrentNowPath = String8(String8::kEmptyString),
53 .batteryCurrentAvgPath = String8(String8::kEmptyString), 53 .batteryCurrentAvgPath = String8(String8::kEmptyString),
54 .batteryChargeCounterPath = String8(String8::kEmptyString), 54 .batteryChargeCounterPath = String8(String8::kEmptyString),
55 .batteryFullChargePath = String8(String8::kEmptyString),
56 .batteryCycleCountPath = String8(String8::kEmptyString),
55 .energyCounter = NULL, 57 .energyCounter = NULL,
56 .boot_min_cap = 0, 58 .boot_min_cap = 0,
57 .screen_on = NULL, 59 .screen_on = NULL,