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

Commit d1d83106 authored by Ruchir Rastogi's avatar Ruchir Rastogi Committed by Automerger Merge Worker
Browse files

Merge "Inject DeviceIdle atom before boot completes" into rvc-dev am: e9e4428d am: 3939c13c 

Change-Id: I65bd4fe6eb778af1d94ff4dbbb8da21dd66e7c1d
parents af8eb7c2 3939c13c

cmds/statsd/src/StatsService.cpp

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

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