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

Rename requirePMF to requirePmf

Browse Source 
Rename to conform to API guidelines.

Bug: 146046526
Test: compiles
Change-Id: Ib888ca3fc14cf30c9217b1f573c2279627c65a22
This commit is contained in:
David Su
2020-01-27 17:47:15 -08:00
parent 613371047b
commit 930a4ec30e
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

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

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

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

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

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

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

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