diff options
| -rw-r--r-- | core/java/android/provider/Settings.java | 11 | ||||
| -rw-r--r-- | core/tests/coretests/src/android/provider/SettingsBackupTest.java | 1 |
2 files changed, 12 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 88d09af6e511..7a4ef5d6bb37 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -9466,6 +9466,17 @@ public final class Settings { 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 * or SHA-256) and carrier app package pairs which are whitelisted to prompt the user for * install when a sim card with matching UICC carrier privilege rules is inserted. The diff --git a/core/tests/coretests/src/android/provider/SettingsBackupTest.java b/core/tests/coretests/src/android/provider/SettingsBackupTest.java index 815294c0c98d..02e0d02a1a0e 100644 --- a/core/tests/coretests/src/android/provider/SettingsBackupTest.java +++ b/core/tests/coretests/src/android/provider/SettingsBackupTest.java @@ -423,6 +423,7 @@ public class SettingsBackupTest { Settings.Global.TETHER_DUN_REQUIRED, Settings.Global.TETHER_OFFLOAD_DISABLED, Settings.Global.TETHER_SUPPORTED, + Settings.Global.TETHER_ENABLE_LEGACY_DHCP_SERVER, Settings.Global.TEXT_CLASSIFIER_CONSTANTS, Settings.Global.THEATER_MODE_ON, Settings.Global.TIME_ONLY_MODE_CONSTANTS, |