summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorBen Schwartz <bemasc@google.com>2017-10-02 13:27:13 -0400
committerBen Schwartz <bemasc@google.com>2017-10-17 14:39:46 -0400
commitbccbd009edf909747a47cdfaa4cbd34343fb13b1 (patch)
treeba1fa4deeefd710d92d21c8386f0bb83a8def13f /core/java/android
parent26817938f6966928488e92de73359c3887006642 (diff)
Add a global setting to disable DNS over TLS
Bug: 63449024 Test: Manual. Appears to work. Change-Id: Ib3b58bfff5951240a2e02f18c362efa96635ef4f
Diffstat (limited to 'core/java/android')
-rwxr-xr-xcore/java/android/provider/Settings.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index c3b84b7be753..74bb618976b7 100755
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -9016,6 +9016,13 @@ public final class Settings {
*/
public static final String DEFAULT_DNS_SERVER = "default_dns_server";
+ /**
+ * Whether to disable DNS over TLS (boolean)
+ *
+ * @hide
+ */
+ public static final String DNS_TLS_DISABLED = "dns_tls_disabled";
+
/** {@hide} */
public static final String
BLUETOOTH_HEADSET_PRIORITY_PREFIX = "bluetooth_headset_priority_";