[core][power_manager] review fixes

2 files changed, 10 insertions, 8 deletions

diff --git a/platform/battery_tracker.cpp b/platform/battery_tracker.cpp
index a80ce09eed..c77139f532 100644
--- a/platform/battery_tracker.cpp
+++ b/platform/battery_tracker.cpp
@@ -18,15 +18,13 @@ void BatteryLevelTracker::Subscribe(Subscriber * subscriber)
 {
   m_subscribers.push_back(subscriber);
 
-  if (IsLevelExpired(m_lastRequestTime))
-  {
-    // Run periodic requests when the first subscriber is added.
-    if (m_subscribers.size() == 1)
-      RequestBatteryLevel();
-  }
-  else
-  {
+  if (!IsLevelExpired(m_lastRequestTime))
     subscriber->OnBatteryLevelReceived(m_lastReceivedLevel);
+
+  if (!m_isTrackingInProgress)
+  {
+    m_isTrackingInProgress = true;
+    RequestBatteryLevel();
   }
 }
 
@@ -44,7 +42,10 @@ void BatteryLevelTracker::UnsubscribeAll()
 void BatteryLevelTracker::RequestBatteryLevel()
 {
   if (m_subscribers.empty())
+  {
+    m_isTrackingInProgress = false;
     return;
+  }
 
   if (IsLevelExpired(m_lastRequestTime))
   {
diff --git a/platform/battery_tracker.hpp b/platform/battery_tracker.hpp
index 65a6b35f3b..320b8372f1 100644
--- a/platform/battery_tracker.hpp
+++ b/platform/battery_tracker.hpp
@@ -26,5 +26,6 @@ private:
   std::vector<Subscriber *> m_subscribers;
   std::chrono::system_clock::time_point m_lastRequestTime;
   uint8_t m_lastReceivedLevel = 0;
+  bool m_isTrackingInProgress = false;
 };
 }  // platform