merge in lmp-mr1-release history after reset to lmp-mr1-dev
diff --git a/service/java/com/android/server/wifi/WifiAutoJoinController.java b/service/java/com/android/server/wifi/WifiAutoJoinController.java
index cd71f48..0dfa3fb 100644
--- a/service/java/com/android/server/wifi/WifiAutoJoinController.java
+++ b/service/java/com/android/server/wifi/WifiAutoJoinController.java
@@ -628,12 +628,10 @@
         // Apply Hysteresis, boost RSSI of current configuration
         if (null != currentConfiguration) {
             if (a.configKey().equals(currentConfiguration)) {
-                aRssiBoost = +10;
+                aRssiBoost = mWifiConfigStore.currentNetworkBoost;
             } else if (b.configKey().equals(currentConfiguration)) {
-                bRssiBoost = +10;
+                bRssiBoost = mWifiConfigStore.currentNetworkBoost;
             }
-
-
         }
 
         if (VDBG)  {
diff --git a/service/java/com/android/server/wifi/WifiConfigStore.java b/service/java/com/android/server/wifi/WifiConfigStore.java
index 9d58445..028e2bb 100644
--- a/service/java/com/android/server/wifi/WifiConfigStore.java
+++ b/service/java/com/android/server/wifi/WifiConfigStore.java
@@ -386,6 +386,8 @@
     public boolean enable5GHzPreference = true;
     public boolean enableWifiCellularHandoverUserTriggeredAdjustment = true;
 
+    public int currentNetworkBoost = 25;
+
     /**
      * Regex pattern for extracting a connect choice.
      * Matches a strings like the following:
@@ -537,6 +539,8 @@
 
         enableAutoJoinWhenAssociated = mContext.getResources().getBoolean(
                 R.bool.config_wifi_framework_enable_associated_network_selection);
+        currentNetworkBoost = mContext.getResources().getInteger(
+                R.integer.config_wifi_framework_current_network_boost);
     }
 
     void enableVerboseLogging(int verbose) {