Merge "Wi-Fi: @IntRange for getRx/TxLinkSpeedMbps" (7ad5e8b7) · Commits · e / os / android_frameworks_base

api/current.txt

+3 −2

Original line number	Diff line number	Diff line
		@@ -29946,13 +29946,14 @@ package android.net.wifi {
		method public String getMacAddress();
		method public int getNetworkId();
		method public int getRssi();
		method public int getRxLinkSpeedMbps();
		method @IntRange(from=0xffffffff) public int getRxLinkSpeedMbps();
		method public String getSSID();
		method public android.net.wifi.SupplicantState getSupplicantState();
		method public int getTxLinkSpeedMbps();
		method @IntRange(from=0xffffffff) public int getTxLinkSpeedMbps();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final String FREQUENCY_UNITS = "MHz";
		field public static final String LINK_SPEED_UNITS = "Mbps";
		field public static final int LINK_SPEED_UNKNOWN = -1; // 0xffffffff
		}

		public class WifiManager {

wifi/java/android/net/wifi/WifiInfo.java

+18 −7

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package android.net.wifi;

		import android.annotation.IntRange;
		import android.annotation.Nullable;
		import android.annotation.SystemApi;
		import android.annotation.UnsupportedAppUsage;
		@@ -100,6 +101,11 @@ public class WifiInfo implements Parcelable {
		public static final String LINK_SPEED_UNITS = "Mbps";
		private int mLinkSpeed;

		/**
		* Constant for unknown link speed.
		*/
		public static final int LINK_SPEED_UNKNOWN = -1;

		/**
		* Tx(transmit) Link speed in Mbps
		*/
		@@ -214,7 +220,7 @@ public class WifiInfo implements Parcelable {
		mNetworkId = -1;
		mSupplicantState = SupplicantState.UNINITIALIZED;
		mRssi = INVALID_RSSI;
		mLinkSpeed = -1;
		mLinkSpeed = LINK_SPEED_UNKNOWN;
		mFrequency = -1;
		}

		@@ -225,9 +231,9 @@ public class WifiInfo implements Parcelable {
		setSSID(null);
		setNetworkId(-1);
		setRssi(INVALID_RSSI);
		setLinkSpeed(-1);
		setTxLinkSpeedMbps(-1);
		setRxLinkSpeedMbps(-1);
		setLinkSpeed(LINK_SPEED_UNKNOWN);
		setTxLinkSpeedMbps(LINK_SPEED_UNKNOWN);
		setRxLinkSpeedMbps(LINK_SPEED_UNKNOWN);
		setFrequency(-1);
		setMeteredHint(false);
		setEphemeral(false);
		@@ -369,8 +375,9 @@ public class WifiInfo implements Parcelable {

		/**
		* Returns the current link speed in {@link #LINK_SPEED_UNITS}.
		* @return the link speed or -1 if there is no valid value.
		* @return the link speed or {@link #LINK_SPEED_UNKNOWN} if link speed is unknown.
		* @see #LINK_SPEED_UNITS
		* @see #LINK_SPEED_UNKNOWN
		*/
		public int getLinkSpeed() {
		return mLinkSpeed;
		@@ -384,8 +391,10 @@ public class WifiInfo implements Parcelable {

		/**
		* Returns the current transmit link speed in Mbps.
		* @return the Tx link speed or -1 if there is no valid value.
		* @return the Tx link speed or {@link #LINK_SPEED_UNKNOWN} if link speed is unknown.
		* @see #LINK_SPEED_UNKNOWN
		*/
		@IntRange(from = -1)
		public int getTxLinkSpeedMbps() {
		return mTxLinkSpeed;
		}
		@@ -400,8 +409,10 @@ public class WifiInfo implements Parcelable {

		/**
		* Returns the current receive link speed in Mbps.
		* @return the Rx link speed or -1 if there is no valid value.
		* @return the Rx link speed or {@link #LINK_SPEED_UNKNOWN} if link speed is unknown.
		* @see #LINK_SPEED_UNKNOWN
		*/
		@IntRange(from = -1)
		public int getRxLinkSpeedMbps() {
		return mRxLinkSpeed;
		}