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

Commit 64dda3cf authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Gerrit Code Review
Browse files

Merge "Add global setting to use new DHCPv4 server"

parents e3a0f42e 0597453f

core/java/android/provider/Settings.java

+11 −0
Original line number Original line Diff line number Diff line
@@ -9465,6 +9465,17 @@ public final class Settings { 
         */

         */

        public static final String TETHER_OFFLOAD_DISABLED = "tether_offload_disabled";

        public static final String TETHER_OFFLOAD_DISABLED = "tether_offload_disabled";




















        /**














         * Use the old dnsmasq DHCP server for tethering instead of the framework implementation.














         *














         * Integer values are interpreted as boolean, and the absence of an explicit setting














         * is interpreted as |true|.














         * TODO: make the default |false|














         * @hide














         */














        public static final String TETHER_ENABLE_LEGACY_DHCP_SERVER =














                "tether_enable_legacy_dhcp_server";
























        /**







        /**











         * List of certificate (hex string representation of the application's certificate - SHA-1







         * List of certificate (hex string representation of the application's certificate - SHA-1











         * or SHA-256) and carrier app package pairs which are whitelisted to prompt the user for







         * or SHA-256) and carrier app package pairs which are whitelisted to prompt the user for

































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



+1
−0




























Original line number
Original line
Diff line number
Diff line








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









                    Settings.Global.TETHER_DUN_REQUIRED,







                    Settings.Global.TETHER_DUN_REQUIRED,











                    Settings.Global.TETHER_OFFLOAD_DISABLED,







                    Settings.Global.TETHER_OFFLOAD_DISABLED,











                    Settings.Global.TETHER_SUPPORTED,







                    Settings.Global.TETHER_SUPPORTED,














                    Settings.Global.TETHER_ENABLE_LEGACY_DHCP_SERVER,











                    Settings.Global.TEXT_CLASSIFIER_CONSTANTS,







                    Settings.Global.TEXT_CLASSIFIER_CONSTANTS,











                    Settings.Global.THEATER_MODE_ON,







                    Settings.Global.THEATER_MODE_ON,











                    Settings.Global.TIME_ONLY_MODE_CONSTANTS,







                    Settings.Global.TIME_ONLY_MODE_CONSTANTS,