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

Commit 2b25322d authored by Kweku Adams's avatar Kweku Adams Committed by Automerger Merge Worker
Browse files

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

Merge "Make it possible to toggle TARE developer options page." into udc-dev am: b251dc92 am: 0e0c13a2

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22384732



Change-Id: I2822413dd469ed5f7ae1ba4da412116667a047d1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0ffe1f6b 0e0c13a2

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
@@ -14934,6 +14934,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








@@ -450,6 +450,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,