diff options
| -rw-r--r-- | src/android/net/dhcp/DhcpClient.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/android/net/dhcp/DhcpClient.java b/src/android/net/dhcp/DhcpClient.java index f4deb47a..4b784331 100644 --- a/src/android/net/dhcp/DhcpClient.java +++ b/src/android/net/dhcp/DhcpClient.java @@ -561,10 +561,15 @@ public class DhcpClient extends StateMachine { /** * check whether or not to support IPv6-only preferred option. + * + * IPv6-only preferred option is supported on Android S by default if there is no experiment + * flag set to disable this feature explicitly. */ public boolean isIPv6OnlyPreferredModeEnabled() { + final boolean defaultEnabled = + ShimUtils.isReleaseOrDevelopmentApiAbove(Build.VERSION_CODES.R); return mDependencies.isFeatureEnabled(mContext, DHCP_IPV6_ONLY_PREFERRED_VERSION, - false /* defaultEnabled */); + defaultEnabled); } private void recordMetricEnabledFeatures() { |