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

Commit e21d7417 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN
Browse files

Fix API in CaptivePortal and ConnectivityManager 

 - Remove CaptivePortal constructor from SystemApi. This constructor was
   added in Q timeframe and ends up being unnecessary since
   CaptivePortal creation was refactored to ConnectivityService because
   of visibility issues on ICaptivePortal.
 - Rename getAvoidBadWifi to shouldAvoidBadWifi
 - Add permission annotation for shouldAvoidBadWifi

Test: flashed, WiFi and captive portal works
Bug: 128935314
Bug: 128935673
(clean cherry-pick of AOSP I7395d4a4db6a64398a827692aee1956c011873e5)

Change-Id: I09545c00af3519dbf141dd5951b28f49e37b3e80
parent 2f8081e7

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