commit 48cb75e8017b0bb46f34283a73252f9caab79f60
author Dmitri Plotnikov <dplotnikov@google.com> Thu Nov 30 18:19:31 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Nov 30 18:19:31 2023 +0000
tree 36ae993d2642cad3108be2990147a78c7625500c
parent f0d16342ae4d8c1748e85f2778ae704f352d69d5
parent d0279eca0e25c0a1bd69c7876b52aa6685194caa

Merge "Fix CPU attribution when power stats collection is disabled" into main

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;
     }
 }