From 930a4ec30ee5f81cb63b762ca6a57b34eb88d705 Mon Sep 17 00:00:00 2001 From: David Su Date: Mon, 27 Jan 2020 17:47:15 -0800 Subject: [PATCH] Rename requirePMF to requirePmf Rename to conform to API guidelines. Bug: 146046526 Test: compiles Change-Id: Ib888ca3fc14cf30c9217b1f573c2279627c65a22 --- src/com/android/settings/wifi/WifiConfigController.java | 6 +++--- src/com/android/settings/wifi/WifiConfigController2.java | 6 +++--- src/com/android/settings/wifi/WifiUtils.java | 6 +++--- src/com/android/settings/wifi/dpp/WifiNetworkConfig.java | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java index a8b32503049..245e56c78ec 100644 --- a/src/com/android/settings/wifi/WifiConfigController.java +++ b/src/com/android/settings/wifi/WifiConfigController.java @@ -665,7 +665,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 @@ -805,7 +805,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 + '"'; @@ -814,7 +814,7 @@ public class WifiConfigController implements TextWatcher, case AccessPoint.SECURITY_OWE: config.allowedKeyManagement.set(KeyMgmt.OWE); - config.requirePMF = true; + config.requirePmf = true; break; default: diff --git a/src/com/android/settings/wifi/WifiConfigController2.java b/src/com/android/settings/wifi/WifiConfigController2.java index add37ddca29..8e73740887b 100644 --- a/src/com/android/settings/wifi/WifiConfigController2.java +++ b/src/com/android/settings/wifi/WifiConfigController2.java @@ -660,7 +660,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 @@ -799,7 +799,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 + '"'; @@ -808,7 +808,7 @@ public class WifiConfigController2 implements TextWatcher, case WifiEntry.SECURITY_OWE: config.allowedKeyManagement.set(KeyMgmt.OWE); - config.requirePMF = true; + config.requirePmf = true; break; default: diff --git a/src/com/android/settings/wifi/WifiUtils.java b/src/com/android/settings/wifi/WifiUtils.java index 9b3c1b368c9..905b2872bb8 100644 --- a/src/com/android/settings/wifi/WifiUtils.java +++ b/src/com/android/settings/wifi/WifiUtils.java @@ -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: diff --git a/src/com/android/settings/wifi/dpp/WifiNetworkConfig.java b/src/com/android/settings/wifi/dpp/WifiNetworkConfig.java index 3c3aa7dafad..fdd0bbef198 100644 --- a/src/com/android/settings/wifi/dpp/WifiNetworkConfig.java +++ b/src/com/android/settings/wifi/dpp/WifiNetworkConfig.java @@ -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); }