Health@2.0: uses @1.0::HealthInfo
Revert "Update for expanding @2.0::HealthInfo."
BatteryService does not use these fields for posting
sticky intents.
This reverts commit be17a4f23529da0b769b745e3296e4e4e5ef06c5.
Test: boots
Bug: 63702641
Change-Id: I4df61645ab38a8e205ee21efc86bbef3e39674ab
diff --git a/healthd/HealthService.cpp b/healthd/HealthService.cpp
index 29a29ed..e8a1a85 100644
--- a/healthd/HealthService.cpp
+++ b/healthd/HealthService.cpp
@@ -28,8 +28,8 @@
using android::hardware::IPCThreadState;
using android::hardware::configureRpcThreadpool;
+using android::hardware::health::V1_0::HealthInfo;
using android::hardware::health::V1_0::hal_conversion::convertToHealthInfo;
-using android::hardware::health::V2_0::HealthInfo;
using android::hardware::health::V2_0::IHealth;
using android::hardware::health::V2_0::implementation::Health;
@@ -89,9 +89,9 @@
// Implementation-defined update logic goes here. An implementation
// can make modifications to prop before broadcasting it to all callbacks.
- HealthInfo info{};
- convertToHealthInfo(prop, info.legacy);
- static_cast<Health*>(gHealth.get())->updateAndNotify(&info);
+ HealthInfo info;
+ convertToHealthInfo(prop, info);
+ static_cast<Health*>(gHealth.get())->notifyListeners(info);
}
static struct healthd_mode_ops healthd_mode_service_2_0_ops = {