diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-08-17 22:21:29 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-08-17 22:21:29 +0000 |
| commit | 3d8ab23deeb76ac4ec4de1cd3eb446e3c55ce732 (patch) | |
| tree | 3e30a2d6c7b2e668d76bf5d17f3a26f4a2e0a844 /service | |
| parent | 690c99175ebfb3aa2ca92d2100f2a5148f081646 (diff) | |
| parent | fac6568cbb329e06b22bfe07993acb263f3762ab (diff) | |
Merge "Wifi connection hysteresis" into oc-mr1-dev
Diffstat (limited to 'service')
| -rw-r--r-- | service/java/com/android/server/wifi/WifiConnectivityManager.java | 4 | ||||
| -rw-r--r-- | service/java/com/android/server/wifi/WifiNetworkSelector.java | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/service/java/com/android/server/wifi/WifiConnectivityManager.java b/service/java/com/android/server/wifi/WifiConnectivityManager.java index 9603357a1..93db5ab67 100644 --- a/service/java/com/android/server/wifi/WifiConnectivityManager.java +++ b/service/java/com/android/server/wifi/WifiConnectivityManager.java @@ -562,9 +562,9 @@ public class WifiConnectivityManager { mConnectionAttemptTimeStamps = new LinkedList<>(); mMin5GHzRssi = context.getResources().getInteger( - R.integer.config_wifi_framework_wifi_score_bad_rssi_threshold_5GHz); + R.integer.config_wifi_framework_wifi_score_entry_rssi_threshold_5GHz); mMin24GHzRssi = context.getResources().getInteger( - R.integer.config_wifi_framework_wifi_score_bad_rssi_threshold_24GHz); + R.integer.config_wifi_framework_wifi_score_entry_rssi_threshold_24GHz); mBand5GHzBonus = context.getResources().getInteger( R.integer.config_wifi_framework_5GHz_preference_boost_factor); mCurrentConnectionBonus = context.getResources().getInteger( diff --git a/service/java/com/android/server/wifi/WifiNetworkSelector.java b/service/java/com/android/server/wifi/WifiNetworkSelector.java index 89068a8cc..071fc07d4 100644 --- a/service/java/com/android/server/wifi/WifiNetworkSelector.java +++ b/service/java/com/android/server/wifi/WifiNetworkSelector.java @@ -575,15 +575,15 @@ public class WifiNetworkSelector { mLocalLog = localLog; mThresholdQualifiedRssi24 = context.getResources().getInteger( - R.integer.config_wifi_framework_wifi_score_low_rssi_threshold_24GHz); + R.integer.config_wifi_framework_wifi_score_low_rssi_threshold_24GHz); mThresholdQualifiedRssi5 = context.getResources().getInteger( - R.integer.config_wifi_framework_wifi_score_low_rssi_threshold_5GHz); + R.integer.config_wifi_framework_wifi_score_low_rssi_threshold_5GHz); mThresholdMinimumRssi24 = context.getResources().getInteger( - R.integer.config_wifi_framework_wifi_score_bad_rssi_threshold_24GHz); + R.integer.config_wifi_framework_wifi_score_entry_rssi_threshold_24GHz); mThresholdMinimumRssi5 = context.getResources().getInteger( - R.integer.config_wifi_framework_wifi_score_bad_rssi_threshold_5GHz); + R.integer.config_wifi_framework_wifi_score_entry_rssi_threshold_5GHz); mEnableAutoJoinWhenAssociated = context.getResources().getBoolean( - R.bool.config_wifi_framework_enable_associated_network_selection); + R.bool.config_wifi_framework_enable_associated_network_selection); mStayOnNetworkMinimumTxRate = context.getResources().getInteger( R.integer.config_wifi_framework_min_tx_rate_for_staying_on_network); mStayOnNetworkMinimumRxRate = context.getResources().getInteger( |