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

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

Merge "Make it possible to toggle TARE developer options page." into udc-dev

parents 10f3de20 18cec23d

apex/jobscheduler/service/java/com/android/server/tare/InternalResourceService.java

+1 −0
Original line number Diff line number Diff line
@@ -1351,6 +1351,7 @@ public class InternalResourceService extends SystemService { 
        }



        @Override

        @EconomyManager.EnabledMode

        public int getEnabledMode() {

            return InternalResourceService.this.getEnabledMode();

        }

core/java/android/provider/Settings.java

+8 −0
Original line number Diff line number Diff line
@@ -14905,6 +14905,14 @@ public final class Settings { 
         */

        public static final String ENABLE_TARE = "enable_tare";









        /**









         * Whether to show the TARE page in Developer Options or not.









         * 1 = true, everything else = false









         *









         * @hide









         */









        public static final String SHOW_TARE_DEVELOPER_OPTIONS = "show_tare_developer_options";

















        /**









         * Settings for AlarmManager's TARE EconomicPolicy (list of its economic factors).









         *

























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



+1
−0






























Original line number
Diff line number
Diff line







@@ -449,6 +449,7 @@ public class SettingsBackupTest {







                    Settings.Global.SHOW_PEOPLE_SPACE,









                    Settings.Global.SHOW_NEW_NOTIF_DISMISS,









                    Settings.Global.SHOW_RESTART_IN_CRASH_DIALOG,









                    Settings.Global.SHOW_TARE_DEVELOPER_OPTIONS,









                    Settings.Global.SHOW_TEMPERATURE_WARNING,









                    Settings.Global.SHOW_USB_TEMPERATURE_ALARM,









                    Settings.Global.SIGNED_CONFIG_VERSION,