summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2019-08-14 00:23:50 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2019-08-14 00:23:50 +0000
commit95ff14c494e7d30d4032e4a021431b200cb99f33 (patch)
tree3d40dcd6ae509dd63a8fa2c6c02e08408db0cc4e
parentca4b67c00030846d3b56744ba03cdb53ecb581c7 (diff)
parent1baebaabbee559b1061f5bfe261a7f07eda25e36 (diff)
Merge cherrypicks of [9193293, 9193352, 9193734, 9193641, 9192591, 9193630] into qt-release
Change-Id: I80f91f34d0844d959f95874a211e3da2fa300241
-rw-r--r--src/android/net/ip/IpClient.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/android/net/ip/IpClient.java b/src/android/net/ip/IpClient.java
index 266b1b0..ad9accc 100644
--- a/src/android/net/ip/IpClient.java
+++ b/src/android/net/ip/IpClient.java
@@ -934,7 +934,7 @@ public class IpClient extends StateMachine {
// accompanying code in IpReachabilityMonitor) is unreachable.
final boolean ignoreIPv6ProvisioningLoss =
mConfiguration != null && mConfiguration.mUsingMultinetworkPolicyTracker
- && mCm.shouldAvoidBadWifi();
+ && !mCm.shouldAvoidBadWifi();
// Additionally:
//