Merge "Only auto-disqualify 2.4GHz NWs when 5GHz NWs are available" into oc-dr1-dev

1 files changed, 35 insertions, 13 deletions

diff --git a/service/java/com/android/server/wifi/WifiNetworkSelector.java b/service/java/com/android/server/wifi/WifiNetworkSelector.java
index ce04bd28e..d24b5ccd8 100644
--- a/service/java/com/android/server/wifi/WifiNetworkSelector.java
+++ b/service/java/com/android/server/wifi/WifiNetworkSelector.java
@@ -25,6 +25,7 @@ import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiInfo;
 import android.text.TextUtils;
 import android.util.LocalLog;
+import android.util.Log;
 import android.util.Pair;
 
 import com.android.internal.R;
@@ -39,6 +40,8 @@ import java.util.List;
  * selects a network for the phone to connect or roam to.
  */
 public class WifiNetworkSelector {
+    private static final String TAG = "WifiNetworkSelector";
+
     private static final long INVALID_TIME_STAMP = Long.MIN_VALUE;
     // Minimum time gap between last successful network selection and a new selection
     // attempt.
@@ -129,7 +132,7 @@ public class WifiNetworkSelector {
         mLocalLog.log(log);
     }
 
-    private boolean isCurrentNetworkSufficient(WifiInfo wifiInfo) {
+    private boolean isCurrentNetworkSufficient(WifiInfo wifiInfo, List<ScanDetail> scanDetails) {
         WifiConfiguration network =
                             mWifiConfigManager.getConfiguredNetwork(wifiInfo.getNetworkId());
 
@@ -154,24 +157,43 @@ public class WifiNetworkSelector {
             return false;
         }
 
-        // 2.4GHz networks is not qualified.
-        if (wifiInfo.is24GHz()) {
-            localLog("Current network is 2.4GHz.");
-            return false;
-        }
-
-        // Is the current network's singnal strength qualified? It can only
-        // be a 5GHz network if we reach here.
         int currentRssi = wifiInfo.getRssi();
-        if (wifiInfo.is5GHz() && currentRssi < mThresholdQualifiedRssi5) {
-            localLog("Current network band=" + (wifiInfo.is5GHz() ? "5GHz" : "2.4GHz")
-                    + ", RSSI[" + currentRssi + "]-acceptable but not qualified.");
+        if (wifiInfo.is24GHz()) {
+            // 2.4GHz networks is not qualified whenever 5GHz is available
+            if (is5GHzNetworkAvailable(scanDetails)) {
+                localLog("Current network is 2.4GHz. 5GHz networks available.");
+                return false;
+            }
+            // When 5GHz is not available, we go through normal 2.4GHz qualification
+            if (currentRssi < mThresholdQualifiedRssi24) {
+                localLog("Current network band=2.4GHz, RSSI["
+                        + currentRssi + "]-acceptable but not qualified.");
+                return false;
+            }
+        } else if (wifiInfo.is5GHz()) {
+            // Must be 5GHz, so we always apply qualification checks
+            if (currentRssi < mThresholdQualifiedRssi5) {
+                localLog("Current network band=5GHz, RSSI["
+                        + currentRssi + "]-acceptable but not qualified.");
+                return false;
+            }
+        } else {
+            Log.e(TAG, "We're on a wifi network that's neither 2.4 or 5GHz... aliens!");
             return false;
         }
 
         return true;
     }
 
+    // Determine whether there are any 5GHz networks in the scan result
+    private boolean is5GHzNetworkAvailable(List<ScanDetail> scanDetails) {
+        for (ScanDetail detail : scanDetails) {
+            ScanResult result = detail.getScanResult();
+            if (result.is5GHz()) return true;
+        }
+        return false;
+    }
+
     private boolean isNetworkSelectionNeeded(List<ScanDetail> scanDetails, WifiInfo wifiInfo,
                         boolean connected, boolean disconnected) {
         if (scanDetails.size() == 0) {
@@ -198,7 +220,7 @@ public class WifiNetworkSelector {
                 }
             }
 
-            if (isCurrentNetworkSufficient(wifiInfo)) {
+            if (isCurrentNetworkSufficient(wifiInfo, scanDetails)) {
                 localLog("Current connected network already sufficient. Skip network selection.");
                 return false;
             } else {