diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2019-03-22 17:16:52 +0900 |
|---|---|---|
| committer | Remi NGUYEN VAN <reminv@google.com> | 2019-03-22 17:16:52 +0900 |
| commit | e21d7417a969bb08d1ed11e689d2ba2a4f640be5 (patch) | |
| tree | b8ed4aaedc62e5b60cecd57b5e67bc284eb148b1 /src | |
| parent | 2f8081e713c1352ac1b45f8e237af0580fdae821 (diff) | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/android/net/ip/IpClient.java | 2 | ||||
| -rw-r--r-- | src/android/net/ip/IpReachabilityMonitor.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/android/net/ip/IpClient.java b/src/android/net/ip/IpClient.java index 61dc966..346ac68 100644 --- a/src/android/net/ip/IpClient.java +++ b/src/android/net/ip/IpClient.java @@ -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: // diff --git a/src/android/net/ip/IpReachabilityMonitor.java b/src/android/net/ip/IpReachabilityMonitor.java index e73cba6..3aa6933 100644 --- a/src/android/net/ip/IpReachabilityMonitor.java +++ b/src/android/net/ip/IpReachabilityMonitor.java @@ -332,7 +332,7 @@ public class IpReachabilityMonitor { } private boolean avoidingBadLinks() { - return !mUsingMultinetworkPolicyTracker || mCm.getAvoidBadWifi(); + return !mUsingMultinetworkPolicyTracker || mCm.shouldAvoidBadWifi(); } public void probeAll() { |