diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2019-03-24 19:46:32 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-03-24 19:46:32 -0700 |
| commit | aefd6efc366f56dadfcf9490d59ada9ba0de493f (patch) | |
| tree | 097449800caa7fb5a742ae6a4a64ec68df8f62ef | |
| parent | 33b58c6b455fea2fb7d0cf663565544295909606 (diff) | |
| parent | bf81ff1bb11b86fff1dba2aeb0eb6e46ec2a1a1d (diff) | |
Merge "Fix API in CaptivePortal and ConnectivityManager"
am: 3c959339ae
Change-Id: I4cc3c61232c74bafe4eb549c1aba5de20a8bb3ff
| -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() { |