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

Commit 8e773ac1 authored by android-build-team Robot's avatar android-build-team Robot Committed by android-build-merger
Browse files

Merge "Use the non-chained interface for mobile/wifi power atoms." into pi-dev 

am: ac10be86

Change-Id: Ib9f3929788d24e010e1315af6524eb7434c2ca83
parents c7029fe7 ac10be86

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

+4 −2
Original line number Diff line number Diff line
@@ -5072,7 +5072,8 @@ public class BatteryStatsImpl extends BatteryStats { 
                    + Integer.toHexString(mHistoryCur.states));

            addHistoryRecordLocked(elapsedRealtime, uptime);

            mMobileRadioPowerState = powerState;

            StatsLog.write(StatsLog.MOBILE_RADIO_POWER_STATE_CHANGED, uid, powerState);

            StatsLog.write_non_chained(StatsLog.MOBILE_RADIO_POWER_STATE_CHANGED, uid, null,

                    powerState);

            if (active) {

                mMobileRadioActiveTimer.startRunningLocked(elapsedRealtime);

                mMobileRadioActivePerAppTimer.startRunningLocked(elapsedRealtime);
@@ -5825,7 +5826,8 @@ public class BatteryStatsImpl extends BatteryStats { 
                    + Integer.toHexString(mHistoryCur.states));

            addHistoryRecordLocked(elapsedRealtime, uptime);

            mWifiRadioPowerState = powerState;

            StatsLog.write(StatsLog.WIFI_RADIO_POWER_STATE_CHANGED, uid, powerState);

            StatsLog.write_non_chained(StatsLog.WIFI_RADIO_POWER_STATE_CHANGED, uid, null,

                    powerState);

        }

    }