PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Rename requirePMF to requirePmf"

Browse Source
This commit is contained in:
David Su
2020-02-14 18:27:15 +00:00
committed by Android (Google) Code Review
parent c6ad5f77e8 930a4ec30e
commit 8de938499e
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/wifi/WifiConfigController.java
View File

@@ -667,7 +667,7 @@ public class WifiConfigController implements TextWatcher,
config.allowedKeyManagement.set(KeyMgmt.IEEE8021X);
if (mAccessPointSecurity == AccessPoint.SECURITY_EAP_SUITE_B) {
config.allowedKeyManagement.set(KeyMgmt.SUITE_B_192);
config.requirePMF = true;
config.requirePmf = true;
config.allowedPairwiseCiphers.set(WifiConfiguration.PairwiseCipher.GCMP_256);
config.allowedGroupCiphers.set(WifiConfiguration.GroupCipher.GCMP_256);
config.allowedGroupManagementCiphers.set(WifiConfiguration.GroupMgmtCipher
@@ -807,7 +807,7 @@ public class WifiConfigController implements TextWatcher,
break;
case AccessPoint.SECURITY_SAE:
config.allowedKeyManagement.set(KeyMgmt.SAE);
config.requirePMF = true;
config.requirePmf = true;
if (mPasswordView.length() != 0) {
String password = mPasswordView.getText().toString();
config.preSharedKey = '"' + password + '"';
@@ -816,7 +816,7 @@ public class WifiConfigController implements TextWatcher,
case AccessPoint.SECURITY_OWE:
config.allowedKeyManagement.set(KeyMgmt.OWE);
config.requirePMF = true;
config.requirePmf = true;
break;
default:

6
src/com/android/settings/wifi/WifiConfigController2.java
View File

@@ -662,7 +662,7 @@ public class WifiConfigController2 implements TextWatcher,
config.allowedKeyManagement.set(KeyMgmt.IEEE8021X);
if (mWifiEntrySecurity == WifiEntry.SECURITY_EAP_SUITE_B) {
config.allowedKeyManagement.set(KeyMgmt.SUITE_B_192);
config.requirePMF = true;
config.requirePmf = true;
config.allowedPairwiseCiphers.set(WifiConfiguration.PairwiseCipher.GCMP_256);
config.allowedGroupCiphers.set(WifiConfiguration.GroupCipher.GCMP_256);
config.allowedGroupManagementCiphers.set(WifiConfiguration.GroupMgmtCipher
@@ -801,7 +801,7 @@ public class WifiConfigController2 implements TextWatcher,
break;
case WifiEntry.SECURITY_SAE:
config.allowedKeyManagement.set(KeyMgmt.SAE);
config.requirePMF = true;
config.requirePmf = true;
if (mPasswordView.length() != 0) {
String password = mPasswordView.getText().toString();
config.preSharedKey = '"' + password + '"';
@@ -810,7 +810,7 @@ public class WifiConfigController2 implements TextWatcher,
case WifiEntry.SECURITY_OWE:
config.allowedKeyManagement.set(KeyMgmt.OWE);
config.requirePMF = true;
config.requirePmf = true;
break;
default:

6
src/com/android/settings/wifi/WifiUtils.java
View File

@@ -193,7 +193,7 @@ public class WifiUtils {
config.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.IEEE8021X);
if (security == AccessPoint.SECURITY_EAP_SUITE_B) {
config.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.SUITE_B_192);
config.requirePMF = true;
config.requirePmf = true;
config.allowedPairwiseCiphers.set(WifiConfiguration.PairwiseCipher.GCMP_256);
config.allowedGroupCiphers.set(WifiConfiguration.GroupCipher.GCMP_256);
config.allowedGroupManagementCiphers.set(WifiConfiguration.GroupMgmtCipher
@@ -207,7 +207,7 @@ public class WifiUtils {
break;
case AccessPoint.SECURITY_SAE:
config.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.SAE);
config.requirePMF = true;
config.requirePmf = true;
if (!TextUtils.isEmpty(password)) {
config.preSharedKey = '"' + password + '"';
}
@@ -215,7 +215,7 @@ public class WifiUtils {
case AccessPoint.SECURITY_OWE:
config.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.OWE);
config.requirePMF = true;
config.requirePmf = true;
break;
default:

4
src/com/android/settings/wifi/dpp/WifiNetworkConfig.java
View File

@@ -253,7 +253,7 @@ public class WifiNetworkConfig {
final WifiConfiguration enhancedOpenNetworkWifiConfiguration =
getBasicWifiConfiguration();
enhancedOpenNetworkWifiConfiguration.allowedKeyManagement.set(KeyMgmt.OWE);
enhancedOpenNetworkWifiConfiguration.requirePMF = true;
enhancedOpenNetworkWifiConfiguration.requirePmf = true;
wifiConfigurations.add(enhancedOpenNetworkWifiConfiguration);
return wifiConfigurations;
}
@@ -282,7 +282,7 @@ public class WifiNetworkConfig {
}
} else if (mSecurity.startsWith(SECURITY_SAE)) {
wifiConfiguration.allowedKeyManagement.set(KeyMgmt.SAE);
wifiConfiguration.requirePMF = true;
wifiConfiguration.requirePmf = true;
if (mPreSharedKey.length() != 0) {
wifiConfiguration.preSharedKey = addQuotationIfNeeded(mPreSharedKey);
}