commit fb10be47c986839a2517f4141fd6af876aef375f
author Dmitri Plotnikov <dplotnikov@google.com> Mon Sep 27 17:50:16 2021 -0700
committer Dmitri Plotnikov <dplotnikov@google.com> Tue Sep 28 17:20:34 2021 +0000
tree 81f373e18b28e6d75f64ee2d3da0f9b73f26842f
parent 50d7e14c25566d4086afd25ce756b7634206dc23

Zero out WiFi duration and power if ControllerActivityCounter is null

Bug: 200346841
Test: atest FrameworksCoreTests:WifiPowerCalculatorTest
Change-Id: I087e3b60c277c1d1a63b6c06e60ffcbe95224668
(cherry picked from commit 199f93ac3b3149a6dea6cccc8a597fdf0ed44c48)

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;