Merge "various autojoin fixes"

2014-05-21 21:05:44 +00:00
parent 711b7a5428 d3adb7e816
commit 2a2dace665
1 changed files with 7 additions and 1 deletions
--- 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
     */