diff options
| -rw-r--r-- | service/java/com/android/server/wifi/SavedNetworkEvaluator.java | 3 | ||||
| -rw-r--r-- | service/java/com/android/server/wifi/WifiConnectivityManager.java | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/service/java/com/android/server/wifi/SavedNetworkEvaluator.java b/service/java/com/android/server/wifi/SavedNetworkEvaluator.java index 62df61028..cafe24ae2 100644 --- a/service/java/com/android/server/wifi/SavedNetworkEvaluator.java +++ b/service/java/com/android/server/wifi/SavedNetworkEvaluator.java @@ -204,7 +204,8 @@ public class SavedNetworkEvaluator implements WifiNetworkSelector.NetworkEvaluat // Same network award. if (currentNetwork != null && (network.networkId == currentNetwork.networkId - || network.isLinked(currentNetwork))) { + //TODO(b/36788683): re-enable linked configuration check + /* || network.isLinked(currentNetwork) */)) { score += mSameNetworkAward; sbuf.append(" Same network the current one bonus: ") .append(mSameNetworkAward).append(","); diff --git a/service/java/com/android/server/wifi/WifiConnectivityManager.java b/service/java/com/android/server/wifi/WifiConnectivityManager.java index 7c38e5def..bb03488e7 100644 --- a/service/java/com/android/server/wifi/WifiConnectivityManager.java +++ b/service/java/com/android/server/wifi/WifiConnectivityManager.java @@ -661,7 +661,8 @@ public class WifiConnectivityManager { if (currentConnectedNetwork != null && (currentConnectedNetwork.networkId == candidate.networkId - || currentConnectedNetwork.isLinked(candidate))) { + //TODO(b/36788683): re-enable linked configuration check + /* || currentConnectedNetwork.isLinked(candidate) */)) { // Framework initiates roaming only if firmware doesn't support // {@link android.net.wifi.WifiManager#WIFI_FEATURE_CONTROL_ROAMING}. if (mConnectivityHelper.isFirmwareRoamingSupported()) { |