commit e622ddc64cf45e43ed5b3c0071e3c4bddc44c8c9
author Hridya Valsaraju <hridya@google.com> Wed Jan 17 23:02:56 2018 -0800
committer Hridya Valsaraju <hridya@google.com> Thu Jan 18 14:51:26 2018 -0800
tree 95951067ae40f58e3d4c6a1086951effc1c11f85
parent c7b0509477e6a4d935f80ee910f7b2fa1fdf1733

health: Modify IHealthInfo Callback interface to return V2.0 HealthInfo

Bug: 71860528
Test: vts-tradefed run vts -m VtsHalHealthV2_0
Change-Id: I7de39ffa4c21772d8878c9a3f054bc6dbbde2fb9

healthd/HealthServiceCommon.cpp

diff --git a/healthd/HealthServiceCommon.cpp b/healthd/HealthServiceCommon.cpp
index e8fbcb0..a2ca44b 100644
--- a/healthd/HealthServiceCommon.cpp
+++ b/healthd/HealthServiceCommon.cpp
@@ -30,7 +30,7 @@
 using android::hardware::configureRpcThreadpool;
 using android::hardware::handleTransportPoll;
 using android::hardware::setupTransportPolling;
-using android::hardware::health::V1_0::HealthInfo;
+using android::hardware::health::V2_0::HealthInfo;
 using android::hardware::health::V1_0::hal_conversion::convertToHealthInfo;
 using android::hardware::health::V2_0::IHealth;
 using android::hardware::health::V2_0::implementation::Health;
@@ -71,8 +71,8 @@
 
 void healthd_mode_service_2_0_battery_update(struct android::BatteryProperties* prop) {
     HealthInfo info;
-    convertToHealthInfo(prop, info);
-    Health::getImplementation()->notifyListeners(info);
+    convertToHealthInfo(prop, info.legacy);
+    Health::getImplementation()->notifyListeners(&info);
 }
 
 static struct healthd_mode_ops healthd_mode_service_2_0_ops = {

storaged/include/storaged.h

diff --git a/storaged/include/storaged.h b/storaged/include/storaged.h
index 7b27988..400e734 100644
--- a/storaged/include/storaged.h
+++ b/storaged/include/storaged.h
@@ -136,7 +136,7 @@
     void remove_user_ce(userid_t user_id);
 
     virtual ::android::hardware::Return<void> healthInfoChanged(
-        const ::android::hardware::health::V1_0::HealthInfo& info);
+        const ::android::hardware::health::V2_0::HealthInfo& info);
     void serviceDied(uint64_t cookie, const wp<::android::hidl::base::V1_0::IBase>& who);
 
     void report_storage_info();

storaged/storaged.cpp

diff --git a/storaged/storaged.cpp b/storaged/storaged.cpp
index 6807cd9..bf8b448 100644
--- a/storaged/storaged.cpp
+++ b/storaged/storaged.cpp
@@ -66,9 +66,9 @@
 using android::hardware::interfacesEqual;
 using android::hardware::Return;
 using android::hardware::health::V1_0::BatteryStatus;
-using android::hardware::health::V1_0::HealthInfo;
 using android::hardware::health::V1_0::toString;
 using android::hardware::health::V2_0::get_health_service;
+using android::hardware::health::V2_0::HealthInfo;
 using android::hardware::health::V2_0::IHealth;
 using android::hardware::health::V2_0::Result;
 using android::hidl::manager::V1_0::IServiceManager;
@@ -80,7 +80,7 @@
 }
 
 Return<void> storaged_t::healthInfoChanged(const HealthInfo& props) {
-    mUidm.set_charger_state(is_charger_on(props.batteryStatus));
+    mUidm.set_charger_state(is_charger_on(props.legacy.batteryStatus));
     return android::hardware::Void();
 }