From e50869df0d1a216a73c7bcbeeb9406d5ba475b20 Mon Sep 17 00:00:00 2001
From: vandwalle <vandwalle@google.com>
Date: Tue, 13 May 2014 13:08:44 -0700
Subject: autojoin is to eager to black list networks due to connection failure

Bug: 14834820

Change-Id: If2862ce09faf583d25cac7713c619975713ccd95
---
 wifi/java/android/net/wifi/WifiConfiguration.java | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'wifi')

diff --git a/wifi/java/android/net/wifi/WifiConfiguration.java b/wifi/java/android/net/wifi/WifiConfiguration.java
index 85b81d9..f22e8a9 100644
--- a/wifi/java/android/net/wifi/WifiConfiguration.java
+++ b/wifi/java/android/net/wifi/WifiConfiguration.java
@@ -417,6 +417,12 @@ public class WifiConfiguration implements Parcelable {
     public int autoJoinStatus;
 
     /**
+     * Set if the configuration was self added by the framework
+     * @hide
+     */
+    public boolean selfAdded;
+
+    /**
      * @hide
      * Indicate that a WifiConfiguration is temporary and should not be saved
      * nor considered by AutoJoin.
@@ -498,6 +504,8 @@ public class WifiConfiguration implements Parcelable {
         proxySettings = ProxySettings.UNASSIGNED;
         linkProperties = new LinkProperties();
         autoJoinStatus = AUTO_JOIN_ENABLED;
+        selfAdded = false;
+        ephemeral = false;
     }
 
     /**
@@ -849,6 +857,7 @@ public class WifiConfiguration implements Parcelable {
             }
             mCachedConfigKey = null; //force null configKey
             autoJoinStatus = source.autoJoinStatus;
+            selfAdded = source.selfAdded;
 
             if (source.visibility != null) {
                 visibility = new Visibility(source.visibility);
@@ -886,6 +895,7 @@ public class WifiConfiguration implements Parcelable {
         dest.writeString(dhcpServer);
         dest.writeString(defaultGwMacAddress);
         dest.writeInt(autoJoinStatus);
+        dest.writeInt(selfAdded ? 1 : 0);
     }
 
     /** Implement the Parcelable interface {@hide} */
@@ -920,7 +930,7 @@ public class WifiConfiguration implements Parcelable {
                 config.dhcpServer = in.readString();
                 config.defaultGwMacAddress = in.readString();
                 config.autoJoinStatus = in.readInt();
-
+                config.selfAdded = in.readInt() != 0;
                 return config;
             }
 
-- 
cgit v1.1