commit c410f2989327390c47986b8c6da7668528e64a1c
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Sep 29 00:30:02 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 29 00:30:02 2021 +0000
tree 02a0b10c4156aa8e1a85c4085779854b6e8b61c1
parent 8dc8182ad0e43f9a8c308425352b7ef91951c083
parent fb10be47c986839a2517f4141fd6af876aef375f

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

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

diff --git a/core/java/com/android/internal/os/WifiPowerCalculator.java b/core/java/com/android/internal/os/WifiPowerCalculator.java
index 776a705..3915b0e 100644
--- a/core/java/com/android/internal/os/WifiPowerCalculator.java
+++ b/core/java/com/android/internal/os/WifiPowerCalculator.java
@@ -215,6 +215,9 @@
                             + "ms tx=" + txTime + "ms power=" + formatCharge(
                             powerDurationAndTraffic.powerMah));
                 }
+            } else {
+                powerDurationAndTraffic.durationMs = 0;
+                powerDurationAndTraffic.powerMah = 0;
             }
         } else {
             final long wifiRunningTime = u.getWifiRunningTime(rawRealtimeUs, statsType) / 1000;