add uid and debug fields to wifiConfiguration
Bug:15111865
Change-Id: I154214c08efe769495cc214cbf65f15d55d83a32
diff --git a/framework/java/android/net/wifi/WifiConfiguration.java b/framework/java/android/net/wifi/WifiConfiguration.java
index 963117c..0faaeba 100644
--- a/framework/java/android/net/wifi/WifiConfiguration.java
+++ b/framework/java/android/net/wifi/WifiConfiguration.java
@@ -324,6 +324,24 @@
/**
* @hide
+ * Uid of app creating the configuration
+ */
+ public int creatorUid;
+
+ /**
+ * @hide
+ * Uid of last app issuing a connection related command
+ */
+ public int lastConnectUid;
+
+ /**
+ * @hide
+ * Uid of last app modifying the configuration
+ */
+ public int lastUpdateUid;
+
+ /**
+ * @hide
* BSSID list on which this configuration was seen.
* TODO: prevent this list to grow infinitely, age-out the results
*/
@@ -441,10 +459,17 @@
/** @hide
* if this is set, the WifiConfiguration cannot use linkages so as to bump
* it's relative priority.
+ * - status between and 128 indicate various level of blacklisting depending
+ * on the severity or frequency of the connection error
+ * - deleted status indicates that the user is deleting the configuration, and so
+ * although it may have been self added we will not re-self-add it, ignore it,
+ * not return it to applications, and not connect to it
* */
public static final int AUTO_JOIN_TEMPORARY_DISABLED = 1;
/** @hide */
- public static final int AUTO_JOIN_DISABLED_ON_AUTH_FAILURE = 2;
+ public static final int AUTO_JOIN_DISABLED_ON_AUTH_FAILURE = 128;
+ /** @hide */
+ public static final int AUTO_JOIN_DELETED = 200;
/**
* @hide
@@ -453,11 +478,23 @@
/**
* Set if the configuration was self added by the framework
+ * This boolean is cleared if we get a connect/save/ update or
+ * any wifiManager command that indicate the user interacted with the configuration
+ * since we will now consider that the configuration belong to him.
* @hide
*/
public boolean selfAdded;
/**
+ * Set if the configuration was self added by the framework
+ * This boolean is set once and never cleared. It is used
+ * so as we never loose track of who created the
+ * configuration in the first place.
+ * @hide
+ */
+ public boolean didSelfAdd;
+
+ /**
* @hide
* Indicate that a WifiConfiguration is temporary and should not be saved
* nor considered by AutoJoin.
@@ -513,6 +550,7 @@
enterpriseConfig = new WifiEnterpriseConfig();
autoJoinStatus = AUTO_JOIN_ENABLED;
selfAdded = false;
+ didSelfAdd = false;
ephemeral = false;
mIpConfiguration = new IpConfiguration();
}
@@ -650,6 +688,10 @@
sbuf.append(mIpConfiguration.toString());
+ if (selfAdded) sbuf.append("selfAdded");
+ if (creatorUid != 0) sbuf.append("uid=" + Integer.toString(creatorUid));
+
+
return sbuf.toString();
}
@@ -883,6 +925,7 @@
networkId = source.networkId;
status = source.status;
disableReason = source.disableReason;
+ disableReason = source.disableReason;
SSID = source.SSID;
BSSID = source.BSSID;
FQDN = source.FQDN;
@@ -933,6 +976,10 @@
}
lastFailure = source.lastFailure;
+ didSelfAdd = source.didSelfAdd;
+ lastConnectUid = source.lastConnectUid;
+ lastUpdateUid = source.lastUpdateUid;
+ creatorUid = source.creatorUid;
}
}
@@ -972,6 +1019,10 @@
dest.writeString(defaultGwMacAddress);
dest.writeInt(autoJoinStatus);
dest.writeInt(selfAdded ? 1 : 0);
+ dest.writeInt(didSelfAdd ? 1 : 0);
+ dest.writeInt(creatorUid);
+ dest.writeInt(lastConnectUid);
+ dest.writeInt(lastUpdateUid);
/*
TODO: should we write the cache results to the parcel?
if (scanResultCache != null) {
@@ -1017,6 +1068,10 @@
config.defaultGwMacAddress = in.readString();
config.autoJoinStatus = in.readInt();
config.selfAdded = in.readInt() != 0;
+ config.didSelfAdd = in.readInt() != 0;
+ config.creatorUid = in.readInt();
+ config.lastConnectUid = in.readInt();
+ config.lastUpdateUid = in.readInt();
/*
TODO: should we write the cache results to the parcel?
boolean done = false;