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

Commit 39b5f2b8 authored by Kweku Adams's avatar Kweku Adams
Browse files

Cleanup TARE flags. 

Remove redundant and obsolete flag constants.

Bug: 158300259
Test: atest CtsAlarmManagerTestCases
Test: atest CtsBatterySavingTestCases
Test: atest CtsJobSchedulerTestCases
Test: atest SettingsBackupTest
Test: atest frameworks/base/services/tests/mockingservicestests/src/com/android/server/alarm
Test: atest frameworks/base/services/tests/mockingservicestests/src/com/android/server/job
Test: atest frameworks/base/services/tests/mockingservicestests/src/com/android/server/tare
Test: atest frameworks/base/services/tests/servicestests/src/com/android/server/job
Test: atest frameworks/base/services/tests/servicestests/src/com/android/server/tare
Change-Id: I962e01748702bd2335692fea53f49dc513efc56a
parent dfb20c72

apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java

+4 −2
Original line number Diff line number Diff line
@@ -862,7 +862,8 @@ public class AlarmManagerService extends SystemService { 
        public boolean KILL_ON_SCHEDULE_EXACT_ALARM_REVOKED =

                DEFAULT_KILL_ON_SCHEDULE_EXACT_ALARM_REVOKED;



        public int USE_TARE_POLICY = Settings.Global.DEFAULT_ENABLE_TARE;

        public int USE_TARE_POLICY = EconomyManager.DEFAULT_ENABLE_POLICY_ALARM

                ? EconomyManager.DEFAULT_ENABLE_TARE_MODE : EconomyManager.ENABLED_MODE_OFF;



        /**

         * The amount of temporary reserve quota to give apps on receiving the
@@ -1294,7 +1295,8 @@ public class AlarmManagerService extends SystemService { 
                    KILL_ON_SCHEDULE_EXACT_ALARM_REVOKED);

            pw.println();



            pw.print(Settings.Global.ENABLE_TARE, USE_TARE_POLICY);

            pw.print(Settings.Global.ENABLE_TARE,

                    EconomyManager.enabledModeToString(USE_TARE_POLICY));

            pw.println();



            pw.print(KEY_TEMPORARY_QUOTA_BUMP, TEMPORARY_QUOTA_BUMP);

apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java

+2 −2
Original line number Diff line number Diff line
@@ -636,7 +636,6 @@ public class JobSchedulerService extends com.android.server.SystemService 
        public static final long DEFAULT_RUNTIME_USER_INITIATED_DATA_TRANSFER_LIMIT_MS =

                Math.min(Long.MAX_VALUE, DEFAULT_RUNTIME_USER_INITIATED_LIMIT_MS);

        static final boolean DEFAULT_PERSIST_IN_SPLIT_FILES = true;

        private static final boolean DEFAULT_USE_TARE_POLICY = false;



        /**

         * Minimum # of non-ACTIVE jobs for which the JMS will be happy running some work early.
@@ -802,7 +801,8 @@ public class JobSchedulerService extends com.android.server.SystemService 
        /**

         * If true, use TARE policy for job limiting. If false, use quotas.

         */

        public boolean USE_TARE_POLICY = DEFAULT_USE_TARE_POLICY;

        public boolean USE_TARE_POLICY = EconomyManager.DEFAULT_ENABLE_POLICY_JOB_SCHEDULER

                && EconomyManager.DEFAULT_ENABLE_TARE_MODE == EconomyManager.ENABLED_MODE_ON;



        private void updateBatchingConstantsLocked() {

            MIN_READY_NON_ACTIVE_JOBS_COUNT = DeviceConfig.getInt(

core/java/android/provider/Settings.java

+3 −42
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ 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;
@@ -14812,36 +14811,14 @@ public final class Settings { 
                = "forced_app_standby_for_small_battery_enabled";















        /**













         * Whether to enable the TARE subsystem as a whole or not.













         * 1 means enable, 0 means disable.













         * Whether to enable the TARE subsystem or not.













         * Valid values are













         * {@link android.app.tare.EconomyManager#ENABLE_TARE_ON EconomyManager.ENABLE_TARE_*}.















         *















         * @hide















         */















        public static final String ENABLE_TARE = "enable_tare";



























        /**













         * Default value for {@link #ENABLE_TARE}.













         *













         * @hide













         */













        public static final int DEFAULT_ENABLE_TARE = EconomyManager.DEFAULT_ENABLE_TARE_MODE;

























        /**













         * Whether to enable the TARE AlarmManager economic policy or not.













         * 1 means enable, 0 means disable.













         *













         * @hide













         */













        public static final String ENABLE_TARE_ALARM_MANAGER = "enable_tare_alarm_manager";

























        /**













         * Default value for {@link #ENABLE_TARE_ALARM_MANAGER}.













         *













         * @hide













         */













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















         *









@@ -14851,22 +14828,6 @@ public final class Settings {













         */















        public static final String TARE_ALARM_MANAGER_CONSTANTS = "tare_alarm_manager_constants";



























        /**













         * Whether to enable the TARE JobScheduler economic policy or not.













         * 1 means enable, 0 means disable.













         *













         * @hide













         */













        public static final String ENABLE_TARE_JOB_SCHEDULER = "enable_tare_job_scheduler";

























        /**













         * Default value for {@link #ENABLE_TARE_JOB_SCHEDULER}.













         *













         * @hide













         */













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















         *

























packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java



+2
−3




























Original line number
Diff line number
Diff line








@@ -148,9 +148,8 @@ public class GlobalSettingsValidators {













                Global.DYNAMIC_POWER_SAVINGS_DISABLE_THRESHOLD, PERCENTAGE_INTEGER_VALIDATOR);















        VALIDATORS.put(Global.BLUETOOTH_ON, BOOLEAN_VALIDATOR);















        VALIDATORS.put(Global.CLOCKWORK_HOME_READY, ANY_STRING_VALIDATOR);













        VALIDATORS.put(Global.ENABLE_TARE, BOOLEAN_VALIDATOR);













        VALIDATORS.put(Global.ENABLE_TARE_ALARM_MANAGER, BOOLEAN_VALIDATOR);













        VALIDATORS.put(Global.ENABLE_TARE_JOB_SCHEDULER, BOOLEAN_VALIDATOR);













        VALIDATORS.put(Global.ENABLE_TARE,













                new DiscreteValueValidator(new String[] {"0", "1", "2"}));















        VALIDATORS.put(Global.TARE_ALARM_MANAGER_CONSTANTS, ANY_STRING_VALIDATOR);















        VALIDATORS.put(Global.TARE_JOB_SCHEDULER_CONSTANTS, ANY_STRING_VALIDATOR);















        VALIDATORS.put(Global.PRIVATE_DNS_MODE, ANY_STRING_VALIDATOR);

































packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java



+0
−2




























Original line number
Diff line number
Diff line








@@ -266,8 +266,6 @@ public class SettingsBackupTest {













                    Settings.Global.ENABLE_EPHEMERAL_FEATURE,















                    Settings.Global.ENABLE_RESTRICTED_BUCKET,















                    Settings.Global.ENABLE_TARE,













                    Settings.Global.ENABLE_TARE_ALARM_MANAGER,













                    Settings.Global.ENABLE_TARE_JOB_SCHEDULER,















                    Settings.Global.DYNAMIC_POWER_SAVINGS_ENABLED,















                    Settings.Global.DYNAMIC_POWER_SAVINGS_DISABLE_THRESHOLD,















                    Settings.Global.SMART_REPLIES_IN_NOTIFICATIONS_FLAGS,