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

Commit e944b124 authored by Yuan Lu's avatar Yuan Lu Committed by Android (Google) Code Review
Browse files

Merge "Add the flag for only alowing wifi on charger/network request option"

parents b2ba7e28 b6b0495a

core/java/android/provider/Settings.java

+9 −0
Original line number Diff line number Diff line
@@ -10616,6 +10616,15 @@ public final class Settings { 
         */

        public static final String OFF_BODY_RADIOS_OFF_DELAY_MS = "off_body_radios_off_delay_ms";



        /**

         * Whether or not to turn on Wifi when proxy is disconnected.

         * Type: int (0 for false, 1 for true)

         * Default: 1

         * @hide

         */

        public static final String WIFI_ON_WHEN_PROXY_DISCONNECTED

                = "wifi_on_when_proxy_disconnected";



        /**

         * Whether or not to enable Time Only Mode for watch type devices.

         * Type: int (0 for false, 1 for true)

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

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

                    Settings.Global.FORCED_APP_STANDBY_ENABLED,

                    Settings.Global.FORCED_APP_STANDBY_FOR_SMALL_BATTERY_ENABLED,

                    Settings.Global.WIFI_ON_WHEN_PROXY_DISCONNECTED,

                    Settings.Global.FSTRIM_MANDATORY_INTERVAL,

                    Settings.Global.GLOBAL_HTTP_PROXY_EXCLUSION_LIST,

                    Settings.Global.GLOBAL_HTTP_PROXY_HOST,