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

Commit aefd6efc authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by android-build-merger
Browse files

Merge "Fix API in CaptivePortal and ConnectivityManager" 

am: 3c959339ae

Change-Id: I4cc3c61232c74bafe4eb549c1aba5de20a8bb3ff
parents 33b58c6b bf81ff1b

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() {