Wifi: Change "Technology" to "Standard" in API
This commit is to change the naming from Wifi Technology to Wifi
Standard. This is to comply with the API council review.
Bug: 143551314
Test: atest com.android.wifi.server
Change-Id: I0584f9b791dd14119af199cb14d4caf4ffbf54ab
diff --git a/framework/java/android/net/wifi/WifiInfo.java b/framework/java/android/net/wifi/WifiInfo.java
index 62ba95d..9de39ed 100644
--- a/framework/java/android/net/wifi/WifiInfo.java
+++ b/framework/java/android/net/wifi/WifiInfo.java
@@ -99,45 +99,45 @@
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 @@
txSuccessRate = source.txSuccessRate;
rxSuccessRate = source.rxSuccessRate;
score = source.score;
- mWifiTechnology = source.mWifiTechnology;
+ mWifiStandard = source.mWifiStandard;
}
}
@@ -419,19 +419,19 @@
}
/**
- * 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 @@
.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 @@
dest.writeString(mNetworkSuggestionOrSpecifierPackageName);
dest.writeString(mFqdn);
dest.writeString(mProviderFriendlyName);
- dest.writeInt(mWifiTechnology);
+ dest.writeInt(mWifiStandard);
}
/** Implement the Parcelable interface {@hide} */
@@ -838,7 +838,7 @@
info.mNetworkSuggestionOrSpecifierPackageName = in.readString();
info.mFqdn = in.readString();
info.mProviderFriendlyName = in.readString();
- info.mWifiTechnology = in.readInt();
+ info.mWifiStandard = in.readInt();
return info;
}
diff --git a/framework/tests/src/android/net/wifi/WifiInfoTest.java b/framework/tests/src/android/net/wifi/WifiInfoTest.java
index ea08ea8..b98cdc3 100644
--- a/framework/tests/src/android/net/wifi/WifiInfoTest.java
+++ b/framework/tests/src/android/net/wifi/WifiInfoTest.java
@@ -38,7 +38,7 @@
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 @@
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 @@
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());
}
}
