commit b1c47fcb8c3afee8bbb3766e03097cd92f5ca6ef
author Kweku Adams <kwekua@google.com> Thu Jan 26 15:34:48 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jan 26 15:34:48 2023 +0000
tree 7356dabf6767ea674a6ee33fd89793e5a61ffcc9
parent cb609ab2021abd2c7ea388af76a92f0452827228
parent 10b550f767549298bea4a5df32beffd029d5919d

Merge "Disable TARE."

apex/jobscheduler/framework/java/android/app/tare/EconomyManager.java

diff --git a/apex/jobscheduler/framework/java/android/app/tare/EconomyManager.java b/apex/jobscheduler/framework/java/android/app/tare/EconomyManager.java
index 95d6f850..581ea7a 100644
--- a/apex/jobscheduler/framework/java/android/app/tare/EconomyManager.java
+++ b/apex/jobscheduler/framework/java/android/app/tare/EconomyManager.java
@@ -126,7 +126,7 @@
     public static final String KEY_ENABLE_TARE_MODE = "enable_tare_mode";
     public static final String KEY_ENABLE_POLICY_ALARM = "enable_policy_alarm";
     public static final String KEY_ENABLE_POLICY_JOB_SCHEDULER = "enable_policy_job";
-    public static final int DEFAULT_ENABLE_TARE_MODE = ENABLED_MODE_ON;
+    public static final int DEFAULT_ENABLE_TARE_MODE = ENABLED_MODE_OFF;
     public static final boolean DEFAULT_ENABLE_POLICY_ALARM = true;
     public static final boolean DEFAULT_ENABLE_POLICY_JOB_SCHEDULER = true;
 

core/java/android/provider/Settings.java

diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index ff57003..925547d86 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -40,6 +40,7 @@
 import android.app.NotificationManager;
 import android.app.SearchManager;
 import android.app.WallpaperManager;
+import android.app.tare.EconomyManager;
 import android.compat.annotation.UnsupportedAppUsage;
 import android.content.ComponentName;
 import android.content.ContentResolver;
@@ -14682,7 +14683,7 @@
          *
          * @hide
          */
-        public static final int DEFAULT_ENABLE_TARE = 1;
+        public static final int DEFAULT_ENABLE_TARE = EconomyManager.DEFAULT_ENABLE_TARE_MODE;
 
         /**
          * Whether to enable the TARE AlarmManager economic policy or not.
@@ -14697,7 +14698,8 @@
          *
          * @hide
          */
-        public static final int DEFAULT_ENABLE_TARE_ALARM_MANAGER = 0;
+        public static final int DEFAULT_ENABLE_TARE_ALARM_MANAGER =
+                        EconomyManager.DEFAULT_ENABLE_POLICY_ALARM ? 1 : 0;
 
         /**
          * Settings for AlarmManager's TARE EconomicPolicy (list of its economic factors).
@@ -14721,7 +14723,8 @@
          *
          * @hide
          */
-        public static final int DEFAULT_ENABLE_TARE_JOB_SCHEDULER = 0;
+        public static final int DEFAULT_ENABLE_TARE_JOB_SCHEDULER =
+                EconomyManager.DEFAULT_ENABLE_POLICY_JOB_SCHEDULER ? 1 : 0;
 
         /**
          * Settings for JobScheduler's TARE EconomicPolicy (list of its economic factors).