Merge "WifiConfiguration: Remove a bunch of unused fields" into pi-dev (086633e0) · Commits · e / os / android_frameworks_base

wifi/java/android/net/wifi/WifiConfiguration.java

+0 −65

Original line number	Diff line number	Diff line
		@@ -611,37 +611,6 @@ public class WifiConfiguration implements Parcelable {
		*/
		public long lastConnected;

		/**
		* @hide
		* Last time the system tried to connect and failed.
		*/
		public long lastConnectionFailure;

		/**
		* @hide
		* Last time the system tried to roam and failed because of authentication failure or DHCP
		* RENEW failure.
		*/
		public long lastRoamingFailure;

		/** @hide */
		public static int ROAMING_FAILURE_IP_CONFIG = 1;
		/** @hide */
		public static int ROAMING_FAILURE_AUTH_FAILURE = 2;

		/**
		* @hide
		* Initial amount of time this Wifi configuration gets blacklisted for network switching
		* because of roaming failure
		*/
		public long roamingFailureBlackListTimeMilli = 1000;

		/**
		* @hide
		* Last roaming failure reason code
		*/
		public int lastRoamingFailureReason;

		/**
		* @hide
		* Last time the system was disconnected to this configuration.
		@@ -1752,28 +1721,6 @@ public class WifiConfiguration implements Parcelable {
		sbuf.append("lastConnected: ").append(TimeUtils.logTimeOfDay(this.lastConnected));
		sbuf.append(" ");
		}
		if (this.lastConnectionFailure != 0) {
		sbuf.append('\n');
		long diff = now_ms - this.lastConnectionFailure;
		if (diff <= 0) {
		sbuf.append("lastConnectionFailure since <incorrect> ");
		} else {
		sbuf.append("lastConnectionFailure: ").append(Long.toString(diff / 1000));
		sbuf.append("sec ");
		}
		}
		if (this.lastRoamingFailure != 0) {
		sbuf.append('\n');
		long diff = now_ms - this.lastRoamingFailure;
		if (diff <= 0) {
		sbuf.append("lastRoamingFailure since <incorrect> ");
		} else {
		sbuf.append("lastRoamingFailure: ").append(Long.toString(diff / 1000));
		sbuf.append("sec ");
		}
		}
		sbuf.append("roamingFailureBlackListTimeMilli: ").
		append(Long.toString(this.roamingFailureBlackListTimeMilli));
		sbuf.append('\n');
		if (this.linkedConfigurations != null) {
		for (String key : this.linkedConfigurations.keySet()) {
		@@ -2118,10 +2065,6 @@ public class WifiConfiguration implements Parcelable {

		lastConnected = source.lastConnected;
		lastDisconnected = source.lastDisconnected;
		lastConnectionFailure = source.lastConnectionFailure;
		lastRoamingFailure = source.lastRoamingFailure;
		lastRoamingFailureReason = source.lastRoamingFailureReason;
		roamingFailureBlackListTimeMilli = source.roamingFailureBlackListTimeMilli;
		numScorerOverride = source.numScorerOverride;
		numScorerOverrideAndSwitchedNetwork = source.numScorerOverrideAndSwitchedNetwork;
		numAssociation = source.numAssociation;
		@@ -2187,10 +2130,6 @@ public class WifiConfiguration implements Parcelable {
		dest.writeInt(lastUpdateUid);
		dest.writeString(creatorName);
		dest.writeString(lastUpdateName);
		dest.writeLong(lastConnectionFailure);
		dest.writeLong(lastRoamingFailure);
		dest.writeInt(lastRoamingFailureReason);
		dest.writeLong(roamingFailureBlackListTimeMilli);
		dest.writeInt(numScorerOverride);
		dest.writeInt(numScorerOverrideAndSwitchedNetwork);
		dest.writeInt(numAssociation);
		@@ -2256,10 +2195,6 @@ public class WifiConfiguration implements Parcelable {
		config.lastUpdateUid = in.readInt();
		config.creatorName = in.readString();
		config.lastUpdateName = in.readString();
		config.lastConnectionFailure = in.readLong();
		config.lastRoamingFailure = in.readLong();
		config.lastRoamingFailureReason = in.readInt();
		config.roamingFailureBlackListTimeMilli = in.readLong();
		config.numScorerOverride = in.readInt();
		config.numScorerOverrideAndSwitchedNetwork = in.readInt();
		config.numAssociation = in.readInt();