Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Wifi: Change "Technology" to "Standard" in API"

Browse Source
This commit is contained in:
Ahmed ElArabawy
2019-11-04 17:58:17 +00:00
committed by Android (Google) Code Review
parent 4fcb9d206a 1e13ad6574
commit e0b4fbaff9
4 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
api/current.txt
View File

@@ -29992,16 +29992,16 @@ package android.net.wifi {
method public String getSSID();
method public android.net.wifi.SupplicantState getSupplicantState();
method @IntRange(from=0xffffffff) public int getTxLinkSpeedMbps();
method public int getWifiTechnology();
method public int getWifiStandard();
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
field public static final int WIFI_TECHNOLOGY_11AC = 5; // 0x5
field public static final int WIFI_TECHNOLOGY_11AX = 6; // 0x6
field public static final int WIFI_TECHNOLOGY_11N = 4; // 0x4
field public static final int WIFI_TECHNOLOGY_LEGACY = 1; // 0x1
field public static final int WIFI_TECHNOLOGY_UNKNOWN = 0; // 0x0
field public static final int WIFI_STANDARD_11AC = 5; // 0x5
field public static final int WIFI_STANDARD_11AX = 6; // 0x6
field public static final int WIFI_STANDARD_11N = 4; // 0x4
field public static final int WIFI_STANDARD_LEGACY = 1; // 0x1
field public static final int WIFI_STANDARD_UNKNOWN = 0; // 0x0
}
public class WifiManager {

2
packages/SettingsLib/src/com/android/settingslib/wifi/WifiUtils.java
View File

@@ -93,7 +93,7 @@ public class WifiUtils {
if (bssid != null) {
visibility.append(" ").append(bssid);
}
visibility.append(" technology = ").append(info.getWifiTechnology());
visibility.append(" standard = ").append(info.getWifiStandard());
visibility.append(" rssi=").append(info.getRssi());
visibility.append(" ");
visibility.append(" score=").append(info.score);

52
wifi/java/android/net/wifi/WifiInfo.java
View File

@@ -99,45 +99,45 @@ public class WifiInfo implements Parcelable {
private int mRssi;
/**
* Wi-Fi unknown technology
* Wi-Fi unknown standard
*/
public static final int WIFI_TECHNOLOGY_UNKNOWN = 0;
public static final int WIFI_STANDARD_UNKNOWN = 0;
/**
* Wi-Fi 802.11a/b/g
*/
public static final int WIFI_TECHNOLOGY_LEGACY = 1;
public static final int WIFI_STANDARD_LEGACY = 1;
/**
* Wi-Fi 802.11n
*/
public static final int WIFI_TECHNOLOGY_11N = 4;
public static final int WIFI_STANDARD_11N = 4;
/**
* Wi-Fi 802.11ac
*/
public static final int WIFI_TECHNOLOGY_11AC = 5;
public static final int WIFI_STANDARD_11AC = 5;
/**
* Wi-Fi 802.11ax
*/
public static final int WIFI_TECHNOLOGY_11AX = 6;
public static final int WIFI_STANDARD_11AX = 6;
/** @hide */
@IntDef(prefix = { "WIFI_TECHNOLOGY_" }, value = {
WIFI_TECHNOLOGY_UNKNOWN,
WIFI_TECHNOLOGY_LEGACY,
WIFI_TECHNOLOGY_11N,
WIFI_TECHNOLOGY_11AC,
WIFI_TECHNOLOGY_11AX
@IntDef(prefix = { "WIFI_STANDARD_" }, value = {
WIFI_STANDARD_UNKNOWN,
WIFI_STANDARD_LEGACY,
WIFI_STANDARD_11N,
WIFI_STANDARD_11AC,
WIFI_STANDARD_11AX
})
@Retention(RetentionPolicy.SOURCE)
public @interface WifiTechnology{}
public @interface WifiStandard{}
/**
* Wi-Fi technology for the connection
* Wi-Fi standard for the connection
*/
private @WifiTechnology int mWifiTechnology;
private @WifiStandard int mWifiStandard;
/**
* The unit in which links speeds are expressed.
@@ -330,7 +330,7 @@ public class WifiInfo implements Parcelable {
txSuccessRate = source.txSuccessRate;
rxSuccessRate = source.rxSuccessRate;
score = source.score;
mWifiTechnology = source.mWifiTechnology;
mWifiStandard = source.mWifiStandard;
}
}
@@ -419,19 +419,19 @@ public class WifiInfo implements Parcelable {
}
/**
* Sets the Wi-Fi technology
* Sets the Wi-Fi standard
* @hide
*/
public void setWifiTechnology(@WifiTechnology int wifiTechnology) {
mWifiTechnology = wifiTechnology;
public void setWifiStandard(@WifiStandard int wifiStandard) {
mWifiStandard = wifiStandard;
}
/**
* Get connection Wi-Fi technology
* @return the connection Wi-Fi technology
* Get connection Wi-Fi standard
* @return the connection Wi-Fi standard
*/
public @WifiTechnology int getWifiTechnology() {
return mWifiTechnology;
public @WifiStandard int getWifiStandard() {
return mWifiStandard;
}
/**
@@ -740,7 +740,7 @@ public class WifiInfo implements Parcelable {
.append(", MAC: ").append(mMacAddress == null ? none : mMacAddress)
.append(", Supplicant state: ")
.append(mSupplicantState == null ? none : mSupplicantState)
.append(", Wi-Fi technology: ").append(mWifiTechnology)
.append(", Wi-Fi standard: ").append(mWifiStandard)
.append(", RSSI: ").append(mRssi)
.append(", Link speed: ").append(mLinkSpeed).append(LINK_SPEED_UNITS)
.append(", Tx Link speed: ").append(mTxLinkSpeed).append(LINK_SPEED_UNITS)
@@ -796,7 +796,7 @@ public class WifiInfo implements Parcelable {
dest.writeString(mNetworkSuggestionOrSpecifierPackageName);
dest.writeString(mFqdn);
dest.writeString(mProviderFriendlyName);
dest.writeInt(mWifiTechnology);
dest.writeInt(mWifiStandard);
}
/** Implement the Parcelable interface {@hide} */
@@ -838,7 +838,7 @@ public class WifiInfo implements Parcelable {
info.mNetworkSuggestionOrSpecifierPackageName = in.readString();
info.mFqdn = in.readString();
info.mProviderFriendlyName = in.readString();
info.mWifiTechnology = in.readInt();
info.mWifiStandard = in.readInt();
return info;
}

6
wifi/tests/src/android/net/wifi/WifiInfoTest.java
View File

@@ -38,7 +38,7 @@ public class WifiInfoTest {
private static final String TEST_PACKAGE_NAME = "com.test.example";
private static final String TEST_FQDN = "test.com";
private static final String TEST_PROVIDER_NAME = "test";
private static final int TEST_WIFI_TECHNOLOGY = WifiInfo.WIFI_TECHNOLOGY_11AC;
private static final int TEST_WIFI_STANDARD = WifiInfo.WIFI_STANDARD_11AC;
/**
* Verify parcel write/read with WifiInfo.
@@ -55,7 +55,7 @@ public class WifiInfoTest {
writeWifiInfo.setFQDN(TEST_FQDN);
writeWifiInfo.setProviderFriendlyName(TEST_PROVIDER_NAME);
writeWifiInfo.setNetworkSuggestionOrSpecifierPackageName(TEST_PACKAGE_NAME);
writeWifiInfo.setWifiTechnology(TEST_WIFI_TECHNOLOGY);
writeWifiInfo.setWifiStandard(TEST_WIFI_STANDARD);
Parcel parcel = Parcel.obtain();
writeWifiInfo.writeToParcel(parcel, 0);
@@ -74,6 +74,6 @@ public class WifiInfoTest {
assertEquals(TEST_PACKAGE_NAME, readWifiInfo.getNetworkSuggestionOrSpecifierPackageName());
assertEquals(TEST_FQDN, readWifiInfo.getPasspointFqdn());
assertEquals(TEST_PROVIDER_NAME, readWifiInfo.getPasspointProviderFriendlyName());
assertEquals(TEST_WIFI_TECHNOLOGY, readWifiInfo.getWifiTechnology());
assertEquals(TEST_WIFI_STANDARD, readWifiInfo.getWifiStandard());
}
}