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

Commit 8d472941 authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Android (Google) Code Review
Browse files

Merge "Fix API in CaptivePortal and ConnectivityManager"

parents 9f80a479 e21d7417

src/android/net/ip/IpClient.java

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

        final boolean ignoreIPv6ProvisioningLoss =

                mConfiguration != null && mConfiguration.mUsingMultinetworkPolicyTracker

                && mCm.getAvoidBadWifi();

                && mCm.shouldAvoidBadWifi();



        // Additionally:

        //

src/android/net/ip/IpReachabilityMonitor.java

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



    private boolean avoidingBadLinks() {

        return !mUsingMultinetworkPolicyTracker || mCm.getAvoidBadWifi();

        return !mUsingMultinetworkPolicyTracker || mCm.shouldAvoidBadWifi();

    }



    public void probeAll() {