From 04c3476986e66814375b1af38ebf98ea37457d1b Mon Sep 17 00:00:00 2001 From: Ruchir Rastogi Date: Thu, 21 May 2020 13:06:24 -0700 Subject: [PATCH] Inject DeviceIdle atom before boot completes Test: m Test: manually verified that DeviceIdleModeStateChanged atom gets logged before boot completes (using ag/11529814 to log) Bug: 156913221 Change-Id: I3dbf154083f1cbe660625066dc50b6a8ffd60d7c --- cmds/statsd/src/StatsService.cpp | 1 - core/java/com/android/internal/os/BatteryStatsImpl.java | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/cmds/statsd/src/StatsService.cpp b/cmds/statsd/src/StatsService.cpp index 4ffa040fafd41..47bab2947aaf0 100644 --- a/cmds/statsd/src/StatsService.cpp +++ b/cmds/statsd/src/StatsService.cpp @@ -1298,7 +1298,6 @@ Status StatsService::getRegisteredExperimentIds(std::vector* experiment return Status::ok(); } - void StatsService::statsCompanionServiceDied(void* cookie) { auto thiz = static_cast(cookie); thiz->statsCompanionServiceDiedImpl(); diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java index 415e21062aa5f..5a1af84eccace 100644 --- a/core/java/com/android/internal/os/BatteryStatsImpl.java +++ b/core/java/com/android/internal/os/BatteryStatsImpl.java @@ -9875,6 +9875,10 @@ public class BatteryStatsImpl extends BatteryStats { mPlatformIdleStateCallback = cb; mRailEnergyDataCallback = railStatsCb; mUserInfoProvider = userInfoProvider; + + // Notify statsd that the system is initially not in doze. + mDeviceIdleMode = DEVICE_IDLE_MODE_OFF; + FrameworkStatsLog.write(FrameworkStatsLog.DEVICE_IDLE_MODE_STATE_CHANGED, mDeviceIdleMode); } @UnsupportedAppUsage