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

Commit 06681e1d authored by Xiao Ma's avatar Xiao Ma Committed by Automerger Merge Worker
Browse files

Enable DHCP IPv6-only preferred option on Android Q and above by default. am:... 

Enable DHCP IPv6-only preferred option on Android Q and above by default. am: 0de4ea5d am: 30ec3842 am: 46e29241 am: 40c946b3

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

Change-Id: I2ae29e016635c9a46cf7289def68e012d9fe705c
parents c1d34159 40c946b3

src/android/net/dhcp/DhcpClient.java

+3 −5
Original line number Original line Diff line number Diff line
@@ -562,14 +562,12 @@ public class DhcpClient extends StateMachine { 
    /**

    /**

     * check whether or not to support IPv6-only preferred option.

     * 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

     * IPv6-only preferred option is enabled by default if there is no experiment flag set to

     * flag set to disable this feature explicitly.

     * disable this feature explicitly.

     */

     */

    public boolean isIPv6OnlyPreferredModeEnabled() {

    public boolean isIPv6OnlyPreferredModeEnabled() {

        final boolean defaultEnabled =

                ShimUtils.isReleaseOrDevelopmentApiAbove(Build.VERSION_CODES.R);

        return mDependencies.isFeatureEnabled(mContext, DHCP_IPV6_ONLY_PREFERRED_VERSION,

        return mDependencies.isFeatureEnabled(mContext, DHCP_IPV6_ONLY_PREFERRED_VERSION,

                defaultEnabled);

                true /* defaultEnabled */);

    }

    }





    private void recordMetricEnabledFeatures() {

    private void recordMetricEnabledFeatures() {