summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jing Ji <jji@google.com> 2024-01-25 18:34:20 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2024-01-25 18:34:20 +0000
commit65fc662980de6f10c930cb2d7eb0ff25aa0cdfda (patch)
treefa4ecd160810707b290a17e986ca8a63c05d0576
parent6855af1d15936b145d00dde2b82689687981390f (diff)
parent5108e81ffc801f35f688d2cc699b0640bad22bfc (diff)
Merge "Turn off the AppBatteryTracker and AppBatteryExemptionTracker" into main
-rw-r--r--core/res/res/values/config.xml2
-rw-r--r--services/core/java/com/android/server/am/AppBatteryExemptionTracker.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 0d1a98785695..23c78fdf108e 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -6611,7 +6611,7 @@
</string-array>
<!-- Whether or not the monitoring on the apps' background battery drain is enabled -->
- <bool name="config_bg_current_drain_monitor_enabled">true</bool>
+ <bool name="config_bg_current_drain_monitor_enabled">false</bool>
<!-- The threshold of the background current drain (in percentage) to the restricted
standby bucket.
diff --git a/services/core/java/com/android/server/am/AppBatteryExemptionTracker.java b/services/core/java/com/android/server/am/AppBatteryExemptionTracker.java
index b07d9a6b258c..9c2e69be7685 100644
--- a/services/core/java/com/android/server/am/AppBatteryExemptionTracker.java
+++ b/services/core/java/com/android/server/am/AppBatteryExemptionTracker.java
@@ -520,7 +520,7 @@ final class AppBatteryExemptionTracker
/**
* Default value to {@link #mTrackerEnabled}.
*/
- static final boolean DEFAULT_BG_BATTERY_EXEMPTION_ENABLED = true;
+ static final boolean DEFAULT_BG_BATTERY_EXEMPTION_ENABLED = false;
AppBatteryExemptionPolicy(@NonNull Injector injector,
@NonNull AppBatteryExemptionTracker tracker) {