Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1c47fcb authored by Kweku Adams's avatar Kweku Adams Committed by Android (Google) Code Review
Browse files

Merge "Disable TARE."

parents cb609ab2 10b550f7

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

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ public class EconomyManager { 
    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

+6 −3
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ import android.app.NotificationChannel; 
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 @@ public final class Settings { 
         *

         * @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 @@ public final class Settings {













         *















         * @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 @@ public final class Settings {













         *















         * @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).