diff options
| author | Ben Schwartz <bemasc@google.com> | 2017-10-20 15:08:55 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-10-20 15:08:55 +0000 |
| commit | 3017ebec8ccc13dc2e3841464b17f40ffae3b441 (patch) | |
| tree | 3323c90b7cfa6b0b6b8de74b259c2a741ba35325 /core/java/android | |
| parent | 7c272665448a97ce664ac44210cf35b0d61a5b9b (diff) | |
| parent | 4a906c167b422b26bb4dcf1956c49cacc6de139a (diff) | |
Merge "Add a global setting to disable DNS over TLS"
am: 4a906c167b
Change-Id: Ie0f5586342b32c9e7c745ab9697b44158a920233
Diffstat (limited to 'core/java/android')
| -rwxr-xr-x | core/java/android/provider/Settings.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 06e76fed6b97..f3b2743c8038 100755 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -9150,6 +9150,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_"; |