From d0279eca0e25c0a1bd69c7876b52aa6685194caa Mon Sep 17 00:00:00 2001
From: Dmitri Plotnikov <dplotnikov@google.com>
Date: Wed, 29 Nov 2023 15:17:03 -0800
Subject: Fix CPU attribution when power stats collection is disabled

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

Change-Id: Id752c5c4d993d499ff843da6da0b34ee8d201dc8
---
 .../java/com/android/server/power/stats/BatteryUsageStatsProvider.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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 303c2457165a..391dd77e3506 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 @@ public class BatteryUsageStatsProvider {
 
                 // 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 class BatteryUsageStatsProvider {
     }
 
     public void setPowerStatsExporterEnabled(boolean enabled) {
-
         mPowerStatsExporterEnabled = enabled;
     }
 }
-- 
cgit v1.2.3-59-g8ed1b