Merge "Rename requirePMF to requirePmf"

This commit is contained in:
David Su
2020-02-14 18:27:15 +00:00
committed by Android (Google) Code Review
4 changed files with 11 additions and 11 deletions

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: