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

Commit bf81ff1b authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix API in CaptivePortal and ConnectivityManager"

parents b42ce2bc 61280b1e

src/android/net/ip/IpClient.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -897,7 +897,7 @@ public class IpClient extends StateMachine { 
        // accompanying code in IpReachabilityMonitor) is unreachable.

        // accompanying code in IpReachabilityMonitor) is unreachable.

        final boolean ignoreIPv6ProvisioningLoss =

        final boolean ignoreIPv6ProvisioningLoss =

                mConfiguration != null && mConfiguration.mUsingMultinetworkPolicyTracker

                mConfiguration != null && mConfiguration.mUsingMultinetworkPolicyTracker

                && mCm.getAvoidBadWifi();

                && mCm.shouldAvoidBadWifi();





        // Additionally:

        // Additionally:

        //

        //

src/android/net/ip/IpReachabilityMonitor.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -332,7 +332,7 @@ public class IpReachabilityMonitor { 
    }

    }





    private boolean avoidingBadLinks() {

    private boolean avoidingBadLinks() {

        return !mUsingMultinetworkPolicyTracker || mCm.getAvoidBadWifi();

        return !mUsingMultinetworkPolicyTracker || mCm.shouldAvoidBadWifi();

    }

    }





    public void probeAll() {

    public void probeAll() {