diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-05-18 07:59:58 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-05-18 07:59:58 +0000 |
| commit | 2b3c858296d34741e32c03b144b14f9532b19bb2 (patch) | |
| tree | c6eaaa41b08edda6c855c2765f9116f0f186babf /core/java | |
| parent | f67a491e449125b756a274c2f9e557504260dfee (diff) | |
| parent | 19841794096e7c9f7112ba25af9bfda04403f791 (diff) | |
Merge "Add explicit override for default Private DNS mode" into pi-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/net/ConnectivityManager.java | 2 | ||||
| -rw-r--r-- | core/java/android/provider/Settings.java | 13 |
2 files changed, 13 insertions, 2 deletions
diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java index 80b1c3dfa06d..c3b8f3959fec 100644 --- a/core/java/android/net/ConnectivityManager.java +++ b/core/java/android/net/ConnectivityManager.java @@ -696,7 +696,7 @@ public class ConnectivityManager { * * @hide */ - public static final String PRIVATE_DNS_DEFAULT_MODE = PRIVATE_DNS_MODE_OPPORTUNISTIC; + public static final String PRIVATE_DNS_DEFAULT_MODE_FALLBACK = PRIVATE_DNS_MODE_OPPORTUNISTIC; private final IConnectivityManager mService; /** diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 27f446aff84d..4038d0b70119 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -9297,7 +9297,7 @@ public final class Settings { * values. * Consists of a comma seperated list of strings: * "name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type" - * note that empty fields can be ommitted: "name,apn,,,,,,,,,310,260,,DUN" + * note that empty fields can be omitted: "name,apn,,,,,,,,,310,260,,DUN" * @hide */ public static final String TETHER_DUN_APN = "tether_dun_apn"; @@ -10358,6 +10358,17 @@ public final class Settings { private static final Validator PRIVATE_DNS_SPECIFIER_VALIDATOR = ANY_STRING_VALIDATOR; + /** + * Forced override of the default mode (hardcoded as "automatic", nee "opportunistic"). + * This allows changing the default mode without effectively disabling other modes, + * all of which require explicit user action to enable/configure. See also b/79719289. + * + * Value is a string, suitable for assignment to PRIVATE_DNS_MODE above. + * + * {@hide} + */ + public static final String PRIVATE_DNS_DEFAULT_MODE = "private_dns_default_mode"; + /** {@hide} */ public static final String BLUETOOTH_HEADSET_PRIORITY_PREFIX = "bluetooth_headset_priority_"; |