Merge "Zero out WiFi duration and power if ControllerActivityCounter is null" into sc-qpr1-dev am: c410f29893

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15934611

Change-Id: Iee9dbf00b4568400c319a348587018bfa3e6fb77
This commit is contained in:
TreeHugger Robot
2021-09-29 00:43:25 +00:00
committed by Automerger Merge Worker

View File

@@ -215,6 +215,9 @@ public class WifiPowerCalculator extends PowerCalculator {
+ "ms tx=" + txTime + "ms power=" + formatCharge( + "ms tx=" + txTime + "ms power=" + formatCharge(
powerDurationAndTraffic.powerMah)); powerDurationAndTraffic.powerMah));
} }
} else {
powerDurationAndTraffic.durationMs = 0;
powerDurationAndTraffic.powerMah = 0;
} }
} else { } else {
final long wifiRunningTime = u.getWifiRunningTime(rawRealtimeUs, statsType) / 1000; final long wifiRunningTime = u.getWifiRunningTime(rawRealtimeUs, statsType) / 1000;