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

Commit 6b635f01 authored by Makoto Onuki's avatar Makoto Onuki Committed by android-build-merger
Browse files

Merge "Add global setting for auto-battery saver threshold max" into pi-dev am: fa63f689 

am: 03c48c3d

Change-Id: I35ced83414a91ef6db9df2534f7e93ae200690c8
parents 4c4c8cd3 03c48c3d

core/java/android/provider/Settings.java

+11 −0
Original line number Diff line number Diff line
@@ -10926,6 +10926,15 @@ public final class Settings { 
        private static final Validator LOW_POWER_MODE_TRIGGER_LEVEL_VALIDATOR =

                new SettingsValidators.InclusiveIntegerRangeValidator(0, 100);





        /**

         * The max value for {@link #LOW_POWER_MODE_TRIGGER_LEVEL}. If this setting is not set

         * or the value is 0, the default max will be used.

         *

         * @hide

         */

        public static final String LOW_POWER_MODE_TRIGGER_LEVEL_MAX = "low_power_trigger_level_max";



         /**

         * If not 0, the activity manager will aggressively finish activities and

         * processes as soon as they are no longer needed.  If 0, the normal
@@ -11602,6 +11611,8 @@ public final class Settings { 
            VALIDATORS.put(DOCK_AUDIO_MEDIA_ENABLED, DOCK_AUDIO_MEDIA_ENABLED_VALIDATOR);

            VALIDATORS.put(ENCODED_SURROUND_OUTPUT, ENCODED_SURROUND_OUTPUT_VALIDATOR);

            VALIDATORS.put(LOW_POWER_MODE_TRIGGER_LEVEL, LOW_POWER_MODE_TRIGGER_LEVEL_VALIDATOR);

            VALIDATORS.put(LOW_POWER_MODE_TRIGGER_LEVEL_MAX,

                    LOW_POWER_MODE_TRIGGER_LEVEL_VALIDATOR);

            VALIDATORS.put(BLUETOOTH_ON, BLUETOOTH_ON_VALIDATOR);

            VALIDATORS.put(PRIVATE_DNS_MODE, PRIVATE_DNS_MODE_VALIDATOR);

            VALIDATORS.put(PRIVATE_DNS_SPECIFIER, PRIVATE_DNS_SPECIFIER_VALIDATOR);

core/tests/coretests/src/android/provider/SettingsBackupTest.java

+1 −0
Original line number Diff line number Diff line
@@ -263,6 +263,7 @@ public class SettingsBackupTest { 
                    Settings.Global.LOW_BATTERY_SOUND,

                    Settings.Global.LOW_BATTERY_SOUND_TIMEOUT,

                    Settings.Global.LOW_POWER_MODE,

                    Settings.Global.LOW_POWER_MODE_TRIGGER_LEVEL_MAX,

                    Settings.Global.LTE_SERVICE_FORCED,

                    Settings.Global.MAX_NOTIFICATION_ENQUEUE_RATE,

                    Settings.Global.MDC_INITIAL_MAX_RETRY,