Merge "auto-roam fixes, disable scanning based on traffic at interface" (38012022) · Commits · e / os / android_frameworks_base

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

+9 −0

Original line number	Diff line number	Diff line
		@@ -340,6 +340,12 @@ public class WifiConfiguration implements Parcelable {
		*/
		public int lastUpdateUid;

		/**
		* @hide
		* Uid of app owning the BSSID
		*/
		public int bssidOwnerUid;

		/**
		* @hide
		* BSSID list on which this configuration was seen.
		@@ -1105,6 +1111,7 @@ public class WifiConfiguration implements Parcelable {
		didSelfAdd = source.didSelfAdd;
		lastConnectUid = source.lastConnectUid;
		lastUpdateUid = source.lastUpdateUid;
		bssidOwnerUid = source.bssidOwnerUid;
		creatorUid = source.creatorUid;
		peerWifiConfiguration = source.peerWifiConfiguration;
		blackListTimestamp = source.blackListTimestamp;
		@@ -1153,6 +1160,7 @@ public class WifiConfiguration implements Parcelable {
		dest.writeInt(creatorUid);
		dest.writeInt(lastConnectUid);
		dest.writeInt(lastUpdateUid);
		dest.writeInt(bssidOwnerUid);
		dest.writeLong(blackListTimestamp);
		}

		@@ -1192,6 +1200,7 @@ public class WifiConfiguration implements Parcelable {
		config.creatorUid = in.readInt();
		config.lastConnectUid = in.readInt();
		config.lastUpdateUid = in.readInt();
		config.bssidOwnerUid = in.readInt();
		config.blackListTimestamp = in.readLong();
		return config;
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -137,7 +137,7 @@ public class WifiInfo implements Parcelable {
		public int lowRssiCount;

		/**
		* @hide *
		* @hide
		*/
		public int score;

		@@ -215,7 +215,6 @@ public class WifiInfo implements Parcelable {
		mRssi = INVALID_RSSI;
		mLinkSpeed = -1;
		mFrequency = -1;
		txBad = 0;
		}

		/** @hide */
		@@ -228,6 +227,7 @@ public class WifiInfo implements Parcelable {
		setLinkSpeed(-1);
		setFrequency(-1);
		setMeteredHint(false);
		txBad = 0;
		txSuccess = 0;
		rxSuccess = 0;
		txRetries = 0;