Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2476044f authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Inject DeviceIdle atom before boot completes" into rvc-dev am:... 

Merge "Merge "Inject DeviceIdle atom before boot completes" into rvc-dev am: e9e4428d am: 3939c13c" into rvc-d1-dev-plus-aosp
parents cc26b8b7 9df029f2

cmds/statsd/src/StatsService.cpp

+0 −1
Original line number Diff line number Diff line
@@ -1288,7 +1288,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();

core/java/com/android/internal/os/BatteryStatsImpl.java

+4 −0
Original line number Diff line number Diff line
@@ -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