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

Commit 50c6c1b3 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6873266 from cd6a3351 to sc-d1-release

Change-Id: I38da362b1b07f2a4bf80e454b73b09481d230408
parents 256bfbde cd6a3351
Loading
Loading
Loading
Loading
+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() {