summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorRemi NGUYEN VAN <reminv@google.com>2018-08-01 15:51:28 +0900
committerRemi NGUYEN VAN <reminv@google.com>2018-08-28 17:47:04 +0900
commit0597453f7c3c2885536deebc164ea616e4c63e8a (patch)
tree0869a044cf54da4e3fc7bf3558fe78cd1420bb05 /core/java
parentbf668472406a4b7f030eb20f35e4e4386b56671f (diff)
Add global setting to use new DHCPv4 server
The setting applies to the choice of DHCPv4 server for tethering. Bug: b/109584964 Test: Still builds, SettingsBackupTest passes Change-Id: Id9b5820883eaf3148f09ad948c34795b3619a30e
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/provider/Settings.java11
1 files changed, 11 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 4347a30a793e..5a6a6edd58aa 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -9380,6 +9380,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