Merge "WifiNetworkSelector: Networks with no internet should not be sufficient" into pi-dev

1 files changed, 6 insertions, 0 deletions

diff --git a/service/java/com/android/server/wifi/WifiNetworkSelector.java b/service/java/com/android/server/wifi/WifiNetworkSelector.java
index 97ef221e7..883ba9301 100644
--- a/service/java/com/android/server/wifi/WifiNetworkSelector.java
+++ b/service/java/com/android/server/wifi/WifiNetworkSelector.java
@@ -179,6 +179,12 @@ public class WifiNetworkSelector {
             return false;
         }
 
+        // Network with no internet access reports is not qualified.
+        if (network.numNoInternetAccessReports > 0 && !network.noInternetAccessExpected) {
+            localLog("Current network has [" + network.numNoInternetAccessReports
+                    + "] no-internet access reports.");
+            return false;
+        }
         return true;
     }