Move SecurityType to WifiAnnotations
Which make it can be reference from the framework/base
Bug: 257348873
Test: atest android.net.wifi, com.android.server.wifi
Change-Id: Ic7b40b7715996fe28c59a7bac19cbdd52a7108f2
diff --git a/framework/java/android/net/wifi/ScanResult.java b/framework/java/android/net/wifi/ScanResult.java
index c6d5cd3..ab08d4b 100644
--- a/framework/java/android/net/wifi/ScanResult.java
+++ b/framework/java/android/net/wifi/ScanResult.java
@@ -1318,7 +1318,7 @@
* @return array of {@code WifiInfo#SECURITY_TYPE_*}.
*/
@NonNull
- public @WifiInfo.SecurityType int[] getSecurityTypes() {
+ public @WifiAnnotations.SecurityType int[] getSecurityTypes() {
List<SecurityParams> params = ScanResultUtil.generateSecurityParamsListFromScanResult(this);
int[] securityTypes = new int[params.size()];
for (int i = 0; i < securityTypes.length; i++) {
diff --git a/framework/java/android/net/wifi/WifiAnnotations.java b/framework/java/android/net/wifi/WifiAnnotations.java
index 91a1973..602226d 100644
--- a/framework/java/android/net/wifi/WifiAnnotations.java
+++ b/framework/java/android/net/wifi/WifiAnnotations.java
@@ -143,4 +143,27 @@
})
@Retention(RetentionPolicy.SOURCE)
public @interface Cipher {}
+
+ /**
+ * Security type of current connection.
+ * @hide
+ */
+ @Retention(RetentionPolicy.SOURCE)
+ @IntDef(prefix = { "SECURITY_TYPE_" }, value = {
+ WifiInfo.SECURITY_TYPE_UNKNOWN,
+ WifiInfo.SECURITY_TYPE_OPEN,
+ WifiInfo.SECURITY_TYPE_WEP,
+ WifiInfo.SECURITY_TYPE_PSK,
+ WifiInfo.SECURITY_TYPE_EAP,
+ WifiInfo.SECURITY_TYPE_SAE,
+ WifiInfo.SECURITY_TYPE_OWE,
+ WifiInfo.SECURITY_TYPE_WAPI_PSK,
+ WifiInfo.SECURITY_TYPE_WAPI_CERT,
+ WifiInfo.SECURITY_TYPE_EAP_WPA3_ENTERPRISE,
+ WifiInfo.SECURITY_TYPE_EAP_WPA3_ENTERPRISE_192_BIT,
+ WifiInfo.SECURITY_TYPE_PASSPOINT_R1_R2,
+ WifiInfo.SECURITY_TYPE_PASSPOINT_R3,
+ WifiInfo.SECURITY_TYPE_DPP,
+ })
+ public @interface SecurityType {}
}
diff --git a/framework/java/android/net/wifi/WifiInfo.java b/framework/java/android/net/wifi/WifiInfo.java
index a83afd3..b033bdd 100644
--- a/framework/java/android/net/wifi/WifiInfo.java
+++ b/framework/java/android/net/wifi/WifiInfo.java
@@ -192,29 +192,6 @@
*/
public static final int DPM_SECURITY_TYPE_UNKNOWN = -1;
- /**
- * Security type of current connection.
- * @hide
- */
- @Retention(RetentionPolicy.SOURCE)
- @IntDef(prefix = { "SECURITY_TYPE_" }, value = {
- SECURITY_TYPE_UNKNOWN,
- SECURITY_TYPE_OPEN,
- SECURITY_TYPE_WEP,
- SECURITY_TYPE_PSK,
- SECURITY_TYPE_EAP,
- SECURITY_TYPE_SAE,
- SECURITY_TYPE_OWE,
- SECURITY_TYPE_WAPI_PSK,
- SECURITY_TYPE_WAPI_CERT,
- SECURITY_TYPE_EAP_WPA3_ENTERPRISE,
- SECURITY_TYPE_EAP_WPA3_ENTERPRISE_192_BIT,
- SECURITY_TYPE_PASSPOINT_R1_R2,
- SECURITY_TYPE_PASSPOINT_R3,
- SECURITY_TYPE_DPP,
- })
- public @interface SecurityType {}
-
/** @see #isPrimary() - No permission to access the field. */
private static final int IS_PRIMARY_NO_PERMISSION = -1;
/** @see #isPrimary() - false */
@@ -1950,7 +1927,7 @@
*
* @return the security type, or {@link #SECURITY_TYPE_UNKNOWN} if not currently connected.
*/
- public @SecurityType int getCurrentSecurityType() {
+ public @WifiAnnotations.SecurityType int getCurrentSecurityType() {
return mSecurityType;
}
@@ -1960,7 +1937,7 @@
* @return security type as a WifiInfo.SecurityType
* @hide
*/
- public static @SecurityType int convertWifiConfigurationSecurityType(
+ public static @WifiAnnotations.SecurityType int convertWifiConfigurationSecurityType(
@WifiConfiguration.SecurityType int wifiConfigSecurity) {
switch (wifiConfigSecurity) {
case WifiConfiguration.SECURITY_TYPE_OPEN:
@@ -2002,7 +1979,7 @@
* @hide
*/
public static int convertSecurityTypeToDpmWifiSecurity(
- @WifiInfo.SecurityType int securityType) {
+ @WifiAnnotations.SecurityType int securityType) {
switch (securityType) {
case SECURITY_TYPE_OPEN:
case SECURITY_TYPE_OWE:
diff --git a/service/java/com/android/server/wifi/WifiNetworkSelector.java b/service/java/com/android/server/wifi/WifiNetworkSelector.java
index 36cae2e..4d14061 100644
--- a/service/java/com/android/server/wifi/WifiNetworkSelector.java
+++ b/service/java/com/android/server/wifi/WifiNetworkSelector.java
@@ -35,6 +35,7 @@
import android.net.wifi.ScanResult;
import android.net.wifi.SecurityParams;
import android.net.wifi.SupplicantState;
+import android.net.wifi.WifiAnnotations;
import android.net.wifi.WifiConfiguration;
import android.net.wifi.WifiInfo;
import android.net.wifi.WifiNetworkSelectionConfig.AssociatedNetworkSelectionOverride;
@@ -551,7 +552,7 @@
// Skip network that does not meet the admin set minimum security level restriction
if (adminMinimumSecurityLevel != 0) {
boolean securityRestrictionPassed = false;
- @WifiInfo.SecurityType int[] securityTypes = scanResult.getSecurityTypes();
+ @WifiAnnotations.SecurityType int[] securityTypes = scanResult.getSecurityTypes();
for (int type : securityTypes) {
int securityLevel = WifiInfo.convertSecurityTypeToDpmWifiSecurity(type);
