Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 6a4d9a3

* commit '6a4d9a3c9f7cbd30a7093f5088a72271a5e504c7':
  BatteryStats: use the same timestamp for comparing intervals

Change-Id: Ieddb50b7c76448b45349ab1316cd8fc5852006cf
This commit is contained in:
Adam Lesinski
2016-04-22 22:24:36 +00:00
committed by android-build-merger
parent 6490218696 6a4d9a3c9f
commit cfc3be21a6
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/com/android/internal/os/BatteryStatsImpl.java
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);