summaryrefslogtreecommitdiffstats
path: root/wifi
diff options
context:
space:
mode:
authorvandwalle <vandwalle@google.com>2014-09-14 19:43:06 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-09-14 19:43:06 +0000
commit397b30b1bdc67b1b26f52ecf439fa5561fc2fb3f (patch)
tree5aafcd430b7f02ba0260398679cbc55150741da4 /wifi
parentd8af6f71029df3e53f2b36723d1ca5ec85991af6 (diff)
parent1bcd0659b017e49ad6fdacae0b772c1f46ad31fa (diff)
downloadframeworks_base-397b30b1bdc67b1b26f52ecf439fa5561fc2fb3f.zip
frameworks_base-397b30b1bdc67b1b26f52ecf439fa5561fc2fb3f.tar.gz
frameworks_base-397b30b1bdc67b1b26f52ecf439fa5561fc2fb3f.tar.bz2
am dfb82a24: am 35967d04: Merge "make wifi cellular params configurable" into lmp-dev
* commit 'dfb82a243b00ced8f093b54a9ed51c06ab11d7ac': make wifi cellular params configurable
Diffstat (limited to 'wifi')
-rw-r--r--wifi/java/android/net/wifi/WifiConfiguration.java9
1 files changed, 6 insertions, 3 deletions
diff --git a/wifi/java/android/net/wifi/WifiConfiguration.java b/wifi/java/android/net/wifi/WifiConfiguration.java
index 9ece434..d27c2f7 100644
--- a/wifi/java/android/net/wifi/WifiConfiguration.java
+++ b/wifi/java/android/net/wifi/WifiConfiguration.java
@@ -382,10 +382,13 @@ public class WifiConfiguration implements Parcelable {
/** The Below RSSI thresholds are used to configure AutoJoin
* - GOOD/LOW/BAD thresholds are used so as to calculate link score
- * - UNWANTED_SOFT are used by the blacklisting logic so as to handle the unwanted network message coming from CS
- * - UNBLACKLIST thresholds are used so as to tweak the speed at which the network is unblacklisted (i.e. if
+ * - UNWANTED_SOFT are used by the blacklisting logic so as to handle
+ * the unwanted network message coming from CS
+ * - UNBLACKLIST thresholds are used so as to tweak the speed at which
+ * the network is unblacklisted (i.e. if
* it is seen with good RSSI, it is blacklisted faster)
- * - INITIAL_AUTOJOIN_ATTEMPT, used to determine how close from the network we need to be before autojoin kicks in
+ * - INITIAL_AUTOJOIN_ATTEMPT, used to determine how close from
+ * the network we need to be before autojoin kicks in
*/
/** @hide **/
public static int INVALID_RSSI = -127;