commit d0279eca0e25c0a1bd69c7876b52aa6685194caa
author Dmitri Plotnikov <dplotnikov@google.com> Wed Nov 29 15:17:03 2023 -0800
committer Dmitri Plotnikov <dplotnikov@google.com> Wed Nov 29 17:34:24 2023 -0800
tree b112809969ea42768e884b57e7676d19b0af1a03
parent 7ab7a215caa216cc0fa727e842f718efc96da375

Fix CPU attribution when power stats collection is disabled

Bug: 313830933
Test: atest CtsStatsdAtomHostTestCases:android.cts.statsdatom.batterystats.BatteryUsageStatsTests

Change-Id: Id752c5c4d993d499ff843da6da0b34ee8d201dc8

services/core/java/com/android/server/power/stats/BatteryUsageStatsProvider.java

diff --git a/services/core/java/com/android/server/power/stats/BatteryUsageStatsProvider.java b/services/core/java/com/android/server/power/stats/BatteryUsageStatsProvider.java
index 303c245..391dd77 100644
--- a/services/core/java/com/android/server/power/stats/BatteryUsageStatsProvider.java
+++ b/services/core/java/com/android/server/power/stats/BatteryUsageStatsProvider.java
@@ -71,7 +71,7 @@
 
                 // Power calculators are applied in the order of registration
                 mPowerCalculators.add(new BatteryChargeCalculator());
-                if (mPowerStatsExporterEnabled) {
+                if (!mPowerStatsExporterEnabled) {
                     mPowerCalculators.add(
                             new CpuPowerCalculator(mCpuScalingPolicies, mPowerProfile));
                 }
@@ -385,7 +385,6 @@
     }
 
     public void setPowerStatsExporterEnabled(boolean enabled) {
-
         mPowerStatsExporterEnabled = enabled;
     }
 }