Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49b63e28 authored by Xiao Ma's avatar Xiao Ma Committed by Automerger Merge Worker
Browse files

Enable DHCP IPv6-only preferred option in Android S by default. am: 07a95325... 

Enable DHCP IPv6-only preferred option in Android S by default. am: 07a95325 am: 9ebf2654 am: 592ed9e1 am: d62458e1 am: 3cbc2166

Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/1440553

Change-Id: Ie2d704f4dcfd17a2fdba8fbc3c17efc84d1398e8
parents fd78aa14 3cbc2166

src/android/net/dhcp/DhcpClient.java

+6 −1
Original line number Diff line number Diff line
@@ -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() {