commit d5cb0b412e3fc0429f0a82d801f8f3983edad375
author android-build-team Robot <android-build-team-robot@google.com> Fri Feb 28 02:10:01 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Fri Feb 28 02:10:01 2020 +0000
tree 80c035e5e04e8ad07a4a0b0211617cd9d3916cbc
parent 7cfbd578a30c462dd8996b1efdc26c21bd844dfc
parent bd908547788934b6b13d1793625f112f95ff96dd

Snap for 6245392 from bd908547788934b6b13d1793625f112f95ff96dd to qt-d4-release

Change-Id: I04392e639313884767d989bf8a51ebd11c259be1

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