diff options
| author | vandwalle <vandwalle@google.com> | 2014-05-21 21:05:44 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-21 21:05:45 +0000 |
| commit | 2a2dace66500d6057b9dc87bbe9597d7302ec914 (patch) | |
| tree | 07609445edf3797f720127cbfb8ff05254c4d31d | |
| parent | 711b7a5428041a39512b540402a654d149152261 (diff) | |
| parent | d3adb7e81658b9c3af8955360acd1b930be6cda8 (diff) | |
| download | frameworks_base-2a2dace66500d6057b9dc87bbe9597d7302ec914.zip frameworks_base-2a2dace66500d6057b9dc87bbe9597d7302ec914.tar.gz frameworks_base-2a2dace66500d6057b9dc87bbe9597d7302ec914.tar.bz2 | |
Merge "various autojoin fixes"
| -rw-r--r-- | wifi/java/android/net/wifi/WifiConfiguration.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/wifi/java/android/net/wifi/WifiConfiguration.java b/wifi/java/android/net/wifi/WifiConfiguration.java index 292f844..769d974 100644 --- a/wifi/java/android/net/wifi/WifiConfiguration.java +++ b/wifi/java/android/net/wifi/WifiConfiguration.java @@ -400,8 +400,14 @@ public class WifiConfiguration implements Parcelable { /** @hide */ public static final int AUTO_JOIN_ENABLED = 0; + /** @hide + * if this is set, the WifiConfiguration cannot use linkages so as to bump + * it's relative priority. + * */ + public static final int AUTO_JOIN_TEMPORARY_DISABLED = 1; /** @hide */ - public static final int AUTO_JOIN_DISABLED_ON_AUTH_FAILURE = 1; + public static final int AUTO_JOIN_DISABLED_ON_AUTH_FAILURE = 2; + /** * @hide */ |