Merge "Remove lazy roam code" into mm-wireless-dev

am: f8cd000f75

* commit 'f8cd000f751b6e886cdcfd254fee34ed2dc4109b':
  Remove lazy roam code

2 files changed, 2 insertions, 89 deletions

diff --git a/service/java/com/android/server/wifi/WifiNative.java b/service/java/com/android/server/wifi/WifiNative.java
index f4810e9dd..a19bee32c 100644
--- a/service/java/com/android/server/wifi/WifiNative.java
+++ b/service/java/com/android/server/wifi/WifiNative.java
@@ -2777,38 +2777,6 @@ public class WifiNative {
         }
     }
 
-    // TODO remove
-    public static class WifiLazyRoamParams {
-        int A_band_boost_threshold;
-        int A_band_penalty_threshold;
-        int A_band_boost_factor;
-        int A_band_penalty_factor;
-        int A_band_max_boost;
-        int lazy_roam_hysteresis;
-        int alert_roam_rssi_trigger;
-
-        WifiLazyRoamParams() {
-        }
-
-        @Override
-        public String toString() {
-            StringBuilder sbuf = new StringBuilder();
-            sbuf.append(" A_band_boost_threshold=").append(this.A_band_boost_threshold);
-            sbuf.append(" A_band_penalty_threshold=").append(this.A_band_penalty_threshold);
-            sbuf.append(" A_band_boost_factor=").append(this.A_band_boost_factor);
-            sbuf.append(" A_band_penalty_factor=").append(this.A_band_penalty_factor);
-            sbuf.append(" A_band_max_boost=").append(this.A_band_max_boost);
-            sbuf.append(" lazy_roam_hysteresis=").append(this.lazy_roam_hysteresis);
-            sbuf.append(" alert_roam_rssi_trigger=").append(this.alert_roam_rssi_trigger);
-            return sbuf.toString();
-        }
-    }
-
-    // TODO remove
-    public boolean setLazyRoam(boolean enabled, WifiLazyRoamParams params) {
-        return false;
-    }
-
     private native static boolean setBssidBlacklistNative(int iface, int id,
                                               String list[]);
 
diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java
index 00df8ee8b..78184d889 100644
--- a/service/java/com/android/server/wifi/WifiStateMachine.java
+++ b/service/java/com/android/server/wifi/WifiStateMachine.java
@@ -1117,7 +1117,6 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiPno
     private static final int sFrameworkMinScanIntervalSaneValue = 10000;
 
     private boolean mPnoEnabled;
-    private boolean mLazyRoamEnabled;
     private long mGScanStartTimeMilli;
     private long mGScanPeriodMilli;
 
@@ -3395,49 +3394,6 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiPno
 
     }
 
-    // In associated more, lazy roam will be looking for 5GHz roam candidate
-    //Fixme: This is for network selection offload , whole function need to be re-written according
-    // to the new design
-    private boolean configureLazyRoam() {
-        /*boolean status;
-        if (!useHalBasedAutoJoinOffload()) return false;
-
-        WifiNative.WifiLazyRoamParams params = new WifiNative.WifiLazyRoamParams();
-        //params.A_band_boost_threshold = mWifiConfigManager.bandPreferenceBoostThreshold5.get();
-        //params.A_band_penalty_threshold =
-            mWifiConfigManager.bandPreferencePenaltyThreshold5.get();
-        params.A_band_boost_factor = mWifiConfigManager.bandPreferenceBoostFactor5;
-        params.A_band_penalty_factor = mWifiConfigManager.bandPreferencePenaltyFactor5;
-        params.A_band_max_boost = 65;
-        params.lazy_roam_hysteresis = 25;
-        params.alert_roam_rssi_trigger = -75;
-
-        if (DBG) {
-            Log.e(TAG, "configureLazyRoam " + params.toString());
-        }
-
-        if (!mWifiNative.setLazyRoam(true, params)) {
-
-            Log.e(TAG, "configureLazyRoam couldnt program params");
-
-            return false;
-        }
-        if (DBG) {
-            Log.e(TAG, "configureLazyRoam success");
-        }*/
-        return true;
-    }
-
-    // In associated more, lazy roam will be looking for 5GHz roam candidate
-    private boolean stopLazyRoam() {
-        boolean status;
-        if (!useHalBasedAutoJoinOffload()) return false;
-        if (DBG) {
-            Log.e(TAG, "stopLazyRoam");
-        }
-        return mWifiNative.setLazyRoam(false, null);
-    }
-
     private boolean startGScanConnectedModeOffload(String reason) {
         if (DBG) {
             if (reason == null) {
@@ -3458,13 +3414,6 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiPno
             }
             return false;
         }
-        mLazyRoamEnabled = configureLazyRoam();
-        if (mLazyRoamEnabled == false) {
-            if (USE_PAUSE_SCANS) {
-                mWifiNative.restartScan();
-            }
-            return false;
-        }
         if (!startConnectedGScan(reason)) {
             if (USE_PAUSE_SCANS) {
                 mWifiNative.restartScan();
@@ -3560,7 +3509,7 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiPno
         // We do this only if screen is on
         WifiScanner.ScanSettings settings;
 
-        if (mPnoEnabled || mLazyRoamEnabled) {
+        if (mPnoEnabled) {
             settings = new WifiScanner.ScanSettings();
             settings.band = WifiScanner.WIFI_BAND_BOTH;
             long now = System.currentTimeMillis();
@@ -3605,7 +3554,7 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiPno
             return false;
         }
 
-        if (mPnoEnabled || mLazyRoamEnabled) {
+        if (mPnoEnabled) {
             settings = new WifiScanner.ScanSettings();
             settings.band = WifiScanner.WIFI_BAND_BOTH;
             long now = System.currentTimeMillis();
@@ -8111,7 +8060,6 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiPno
 
             mLastDriverRoamAttempt = 0;
             mTargetNetworkId = WifiConfiguration.INVALID_NETWORK_ID;
-            //startLazyRoam();
         }
         @Override
         public boolean processMessage(Message message) {
@@ -8396,9 +8344,6 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiPno
             logd("WifiStateMachine: Leaving Connected state");
             setScanAlarm(false);
             mLastDriverRoamAttempt = 0;
-
-            stopLazyRoam();
-
             mWhiteListedSsids = null;
         }
     }