Merge "[Wi-Fi DPP] Support WPA2/WPA3 transition mode" into qt-dev (34544681) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/wifi/dpp/WifiDppUtils.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -205,6 +205,11 @@ public class WifiDppUtils {
		final WifiConfiguration wifiConfiguration = accessPoint.getConfig();
		setConfiguratorIntentExtra(intent, wifiManager, wifiConfiguration);

		// For a transition mode Wi-Fi AP, creates a QR code that's compatible with more devices
		if (accessPoint.getSecurity() == AccessPoint.SECURITY_PSK_SAE_TRANSITION) {
		intent.putExtra(EXTRA_WIFI_SECURITY, WifiQrCode.SECURITY_WPA_PSK);
		}

		return intent;
		}

		@@ -400,6 +405,7 @@ public class WifiDppUtils {
		}
		break;
		case AccessPoint.SECURITY_PSK:
		case AccessPoint.SECURITY_PSK_SAE_TRANSITION:
		return true;
		default:
		}
		@@ -412,6 +418,8 @@ public class WifiDppUtils {
		case AccessPoint.SECURITY_PSK:
		case AccessPoint.SECURITY_WEP:
		case AccessPoint.SECURITY_NONE:
		case AccessPoint.SECURITY_PSK_SAE_TRANSITION:
		case AccessPoint.SECURITY_OWE_TRANSITION:
		return true;
		case AccessPoint.SECURITY_SAE:
		if (wifiManager.isWpa3SaeSupported()) {