summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Ruchir Rastogi <ruchirr@google.com> 2020-05-21 13:06:24 -0700
committer Ruchir Rastogi <ruchirr@google.com> 2020-05-27 17:43:39 +0000
commit04c3476986e66814375b1af38ebf98ea37457d1b (patch)
tree3a6df98703c27f120715d203e520deadb510f73d
parenteafbb325ebb43df443b100c3221dfecc754be3e1 (diff)
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
-rw-r--r--cmds/statsd/src/StatsService.cpp1
-rw-r--r--core/java/com/android/internal/os/BatteryStatsImpl.java4
2 files changed, 4 insertions, 1 deletions
diff --git a/cmds/statsd/src/StatsService.cpp b/cmds/statsd/src/StatsService.cpp
index 4ffa040fafd4..47bab2947aaf 100644
--- a/cmds/statsd/src/StatsService.cpp
+++ b/cmds/statsd/src/StatsService.cpp
@@ -1298,7 +1298,6 @@ Status StatsService::getRegisteredExperimentIds(std::vector<int64_t>* experiment
return Status::ok();
}
-
void StatsService::statsCompanionServiceDied(void* cookie) {
auto thiz = static_cast<StatsService*>(cookie);
thiz->statsCompanionServiceDiedImpl();
diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java
index 415e21062aa5..5a1af84eccac 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