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

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

Snap for 6901114 from c09e4fe3 to sc-d1-release

Change-Id: I546fafee709f62dc9fca48ccebc723ce7e6bde58
parents d14b445f c09e4fe3
Loading
Loading
Loading
Loading
+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() {