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

Commit d49dbec9 authored by Adam Lesinski's avatar Adam Lesinski Committed by android-build-merger
Browse files

Merge "Merge "BatteryStats: use the same timestamp for comparing intervals"... 

Merge "Merge "BatteryStats: use the same timestamp for comparing intervals" into nyc-dev am: 6a4d9a3c am: fc6f395d" into nyc-mr1-dev-plus-aosp
am: 5acf0f07

* commit '5acf0f07':
  BatteryStats: use the same timestamp for comparing intervals

Change-Id: I81f64a0d5bea38b8426e96eb7a52da05fea36d8f
parents db13b0e4 5acf0f07

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

+1 −1
Original line number Diff line number Diff line
@@ -3400,7 +3400,7 @@ public class BatteryStatsImpl extends BatteryStats { 
                    powerState == DataConnectionRealTimeInfo.DC_POWER_STATE_MEDIUM

                            || powerState == DataConnectionRealTimeInfo.DC_POWER_STATE_HIGH;

            if (active) {

                mMobileRadioActiveStartTime = realElapsedRealtimeMs = elapsedRealtime;

                mMobileRadioActiveStartTime = realElapsedRealtimeMs = timestampNs / (1000 * 1000);

                mHistoryCur.states |= HistoryItem.STATE_MOBILE_RADIO_ACTIVE_FLAG;

            } else {

                realElapsedRealtimeMs = timestampNs / (1000*1000);