commit 6dd909a61e6e6365e8442f05e615abaea5670668
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Mar 06 00:26:45 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Mar 06 00:26:45 2020 +0000
tree 5fda7f4c01c256007aa6074802a4528c7441bb34
parent 10f6b5473dcbab869c3801a5eec552e8d611a0f1
parent d051af7e5589183e09120a650d187147f2c0c5d3

Merge stage-aosp-master to aosp-master - DO NOT MERGE am: a54deb34ff am: d051af7e55

Change-Id: I4741dc50fa9fc1af795d2b1cf62fffe5d01c6351

wpa_supplicant/hidl/1.2/sta_network.cpp

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;
 	}