commit f723db3b84e2ea6ba75799b83b12b360a6b661a5
author Yifan Hong <elsk@google.com> Mon Nov 25 16:36:39 2019 -0800
committer android-build-merger <android-build-merger@google.com> Mon Nov 25 16:36:39 2019 -0800
tree 5a932d7c596c23245c88e397d0abaebbcda6155d
parent 1e9bac4b58062288172eb1650d476fccf6d2041c
parent b68a055c686342afbd5c418625704ba1b79247b2

Merge "health 2.0: Check health_loop status for passthrough usage"
am: b68a055c68

Change-Id: I8f1da886f17c7545bb6338aa28375d74d3f2d379

health/2.0/default/healthd_common_adapter.cpp

diff --git a/health/2.0/default/healthd_common_adapter.cpp b/health/2.0/default/healthd_common_adapter.cpp
index 8fc689d..0b5d869 100644
--- a/health/2.0/default/healthd_common_adapter.cpp
+++ b/health/2.0/default/healthd_common_adapter.cpp
@@ -49,11 +49,14 @@
 static std::unique_ptr<HealthLoopAdapter> health_loop;
 
 int healthd_register_event(int fd, void (*handler)(uint32_t), EventWakeup wakeup) {
+    if (!health_loop) return -1;
+
     auto wrapped_handler = [handler](auto*, uint32_t epevents) { handler(epevents); };
     return health_loop->RegisterEvent(fd, wrapped_handler, wakeup);
 }
 
 void healthd_battery_update_internal(bool charger_online) {
+    if (!health_loop) return;
     health_loop->AdjustWakealarmPeriods(charger_online);
 }