Merge "BatteryStats: use the same timestamp for comparing intervals" into nyc-dev

This commit is contained in:
Adam Lesinski
2016-04-22 22:20:35 +00:00
committed by Android (Google) Code Review

View File

@@ -3400,7 +3400,7 @@ public class BatteryStatsImpl extends BatteryStats {
powerState == DataConnectionRealTimeInfo.DC_POWER_STATE_MEDIUM powerState == DataConnectionRealTimeInfo.DC_POWER_STATE_MEDIUM
|| powerState == DataConnectionRealTimeInfo.DC_POWER_STATE_HIGH; || powerState == DataConnectionRealTimeInfo.DC_POWER_STATE_HIGH;
if (active) { if (active) {
mMobileRadioActiveStartTime = realElapsedRealtimeMs = elapsedRealtime; mMobileRadioActiveStartTime = realElapsedRealtimeMs = timestampNs / (1000 * 1000);
mHistoryCur.states |= HistoryItem.STATE_MOBILE_RADIO_ACTIVE_FLAG; mHistoryCur.states |= HistoryItem.STATE_MOBILE_RADIO_ACTIVE_FLAG;
} else { } else {
realElapsedRealtimeMs = timestampNs / (1000*1000); realElapsedRealtimeMs = timestampNs / (1000*1000);