From 7fa7225cc450816e371016e805e6695084552865 Mon Sep 17 00:00:00 2001 From: Hridya Valsaraju Date: Fri, 12 Jan 2018 17:44:33 -0800 Subject: [PATCH] Create a friend method for reporting battery health Bug: 71860528 Test: Test: vts-tradefed run vts -m VtsHalHealthV2_0 Change-Id: I6c56c601ee59fe33ee4a19dd4aeafbe3a1bd4c72 --- healthd/Android.mk | 2 ++ healthd/BatteryMonitor.cpp | 4 ++++ healthd/include/healthd/BatteryMonitor.h | 1 + 3 files changed, 7 insertions(+) diff --git a/healthd/Android.mk b/healthd/Android.mk index 9127c60f7..7792eafc3 100644 --- a/healthd/Android.mk +++ b/healthd/Android.mk @@ -50,6 +50,7 @@ LOCAL_STATIC_LIBRARIES := \ android.hardware.health@2.0 \ android.hardware.health@2.0-impl \ android.hardware.health@1.0 \ + android.hardware.health@1.0-convert \ libhealthstoragedefault \ libminui \ libpng \ @@ -96,6 +97,7 @@ CHARGER_STATIC_LIBRARIES := \ android.hardware.health@2.0-impl \ android.hardware.health@2.0 \ android.hardware.health@1.0 \ + android.hardware.health@1.0-convert \ libhidltransport \ libhidlbase \ libhwbinder \ diff --git a/healthd/BatteryMonitor.cpp b/healthd/BatteryMonitor.cpp index 676ee4151..561948cef 100644 --- a/healthd/BatteryMonitor.cpp +++ b/healthd/BatteryMonitor.cpp @@ -86,6 +86,10 @@ BatteryMonitor::BatteryMonitor() : mHealthdConfig(nullptr), mBatteryDevicePresen initBatteryProperties(&props); } +struct BatteryProperties getBatteryProperties(BatteryMonitor* batteryMonitor) { + return batteryMonitor->props; +} + int BatteryMonitor::getBatteryStatus(const char* status) { int ret; struct sysfsStringEnumMap batteryStatusMap[] = { diff --git a/healthd/include/healthd/BatteryMonitor.h b/healthd/include/healthd/BatteryMonitor.h index f9067ccfa..b6a1b6600 100644 --- a/healthd/include/healthd/BatteryMonitor.h +++ b/healthd/include/healthd/BatteryMonitor.h @@ -42,6 +42,7 @@ class BatteryMonitor { int getChargeStatus(); status_t getProperty(int id, struct BatteryProperty *val); void dumpState(int fd); + friend struct BatteryProperties getBatteryProperties(BatteryMonitor* batteryMonitor); private: struct healthd_config *mHealthdConfig;