Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Disable TARE."

Browse Source
This commit is contained in:
Kweku Adams
2023-01-26 15:34:48 +00:00
committed by Android (Google) Code Review
parent cb609ab202 10b550f767
commit b1c47fcb8c
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apex/jobscheduler/framework/java/android/app/tare/EconomyManager.java
View File

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

9
core/java/android/provider/Settings.java
View File

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