DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master
Bug: 151763422
Change-Id: I427abb5c9c7146b02b164eb93a105b56f9ecff86
diff --git a/wpa_supplicant/hidl/1.2/sta_network.cpp b/wpa_supplicant/hidl/1.2/sta_network.cpp
index 57622f8..4d694f7 100644
--- a/wpa_supplicant/hidl/1.2/sta_network.cpp
+++ b/wpa_supplicant/hidl/1.2/sta_network.cpp
@@ -2131,10 +2131,6 @@
*/
void StaNetwork::setFastTransitionKeyMgmt(uint32_t &key_mgmt_mask)
{
- if (key_mgmt_mask & WPA_KEY_MGMT_SAE) {
- key_mgmt_mask |= WPA_KEY_MGMT_FT_SAE;
- }
-
if (key_mgmt_mask & WPA_KEY_MGMT_PSK) {
key_mgmt_mask |= WPA_KEY_MGMT_FT_PSK;
}
@@ -2150,10 +2146,6 @@
*/
void StaNetwork::resetFastTransitionKeyMgmt(uint32_t &key_mgmt_mask)
{
- if (key_mgmt_mask & WPA_KEY_MGMT_SAE) {
- key_mgmt_mask &= ~WPA_KEY_MGMT_FT_SAE;
- }
-
if (key_mgmt_mask & WPA_KEY_MGMT_PSK) {
key_mgmt_mask &= ~WPA_KEY_MGMT_FT_PSK;
}