Merge "Retire ScanResult.autoJoinStatus" into mm-wireless-dev

4 files changed, 0 insertions, 34 deletions

diff --git a/service/java/com/android/server/wifi/ScanDetailCache.java b/service/java/com/android/server/wifi/ScanDetailCache.java
index d246c5507..62d8683ed 100644
--- a/service/java/com/android/server/wifi/ScanDetailCache.java
+++ b/service/java/com/android/server/wifi/ScanDetailCache.java
@@ -278,9 +278,6 @@ class ScanDetailCache {
                 }
                 sbuf.append("{").append(result.BSSID).append(",").append(result.frequency);
                 sbuf.append(",").append(String.format("%3d", result.level));
-                if (result.autoJoinStatus > 0) {
-                    sbuf.append(",st=").append(result.autoJoinStatus);
-                }
                 if (ageSec > 0 || ageMilli > 0) {
                     sbuf.append(String.format(",%4d.%02d.%02d.%02d.%03dms", ageDay,
                             ageHour, ageMin, ageSec, ageMilli));
diff --git a/service/java/com/android/server/wifi/WifiConfigManager.java b/service/java/com/android/server/wifi/WifiConfigManager.java
index 249a46513..a0315d296 100644
--- a/service/java/com/android/server/wifi/WifiConfigManager.java
+++ b/service/java/com/android/server/wifi/WifiConfigManager.java
@@ -1056,31 +1056,6 @@ public class WifiConfigManager {
         return result;
     }
 
-    /**
-     * Firmware is roaming away from this BSSID, and this BSSID was on 5GHz, and it's RSSI was good,
-     * this means we have a situation where we would want to remain on this BSSID but firmware
-     * is not successful at it.
-     * This situation is observed on a small number of Access Points, b/17960587
-     * In that situation, blacklist this BSSID really hard so as framework will not attempt to
-     * roam to it for the next 8 hours. We do not to keep flipping between 2.4 and 5GHz band..
-     * TODO: review the blacklisting strategy so as to make it softer and adaptive
-     * @param info
-     */
-    void driverRoamedFrom(WifiInfo info) {
-        if (info != null && info.getBSSID() != null && ScanResult.is5GHz(info.getFrequency())
-                && info.getRssi() > (thresholdSaturatedRssi5.get())) {
-            WifiConfiguration config = getWifiConfiguration(info.getNetworkId());
-            if (config != null) {
-                if (getScanDetailCache(config) != null) {
-                    ScanResult result = getScanDetailCache(config).get(info.getBSSID());
-                    if (result != null) {
-                        result.setAutoJoinStatus(ScanResult.AUTO_ROAM_DISABLED + 1);
-                    }
-                }
-            }
-        }
-    }
-
     void noteRoamingFailure(WifiConfiguration config, int reason) {
         if (config == null) return;
         config.lastRoamingFailure = System.currentTimeMillis();
@@ -3317,7 +3292,6 @@ public class WifiConfigManager {
         ScanResult result = scanDetailCache.get(scanResult.BSSID);
         if (result != null) {
             // transfer the black list status
-            scanResult.autoJoinStatus = result.autoJoinStatus;
             scanResult.blackListTimestamp = result.blackListTimestamp;
             scanResult.numIpConfigFailures = result.numIpConfigFailures;
             scanResult.numConnection = result.numConnection;
diff --git a/service/java/com/android/server/wifi/WifiNetworkHistory.java b/service/java/com/android/server/wifi/WifiNetworkHistory.java
index 5edb02848..8cdb17a1d 100644
--- a/service/java/com/android/server/wifi/WifiNetworkHistory.java
+++ b/service/java/com/android/server/wifi/WifiNetworkHistory.java
@@ -502,7 +502,6 @@ public class WifiNetworkHistory {
                                     ScanDetail scanDetail = new ScanDetail(wssid, bssid,
                                             caps, rssi, freq, (long) 0, seen);
                                     getScanDetailCache(config, scanDetailCaches).put(scanDetail);
-                                    scanDetail.getScanResult().autoJoinStatus = status;
                                 }
                             }
                             break;
diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java
index 83af0c15e..644248b59 100644
--- a/service/java/com/android/server/wifi/WifiStateMachine.java
+++ b/service/java/com/android/server/wifi/WifiStateMachine.java
@@ -8233,10 +8233,6 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiPno
                     // ASSOCIATING to a new BSSID while already connected, indicates
                     // that driver is roaming
                     mLastDriverRoamAttempt = System.currentTimeMillis();
-                    String toBSSID = (String)message.obj;
-                    if (toBSSID != null && !toBSSID.equals(mWifiInfo.getBSSID())) {
-                        mWifiConfigManager.driverRoamedFrom(mWifiInfo);
-                    }
                     return NOT_HANDLED;
                 case WifiMonitor.NETWORK_DISCONNECTION_EVENT:
                     long lastRoam = 0;