aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2020-02-28 02:10:01 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2020-02-28 02:10:01 +0000
commitd5cb0b412e3fc0429f0a82d801f8f3983edad375 (patch)
tree80c035e5e04e8ad07a4a0b0211617cd9d3916cbc
parent7cfbd578a30c462dd8996b1efdc26c21bd844dfc (diff)
parentbd908547788934b6b13d1793625f112f95ff96dd (diff)
downloadwpa_supplicant_8-android10-d4-s1-release.tar.gz
Snap for 6245392 from bd908547788934b6b13d1793625f112f95ff96dd to qt-d4-releaseandroid-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android10-d4-s1-releaseandroid10-d4-release
Change-Id: I04392e639313884767d989bf8a51ebd11c259be1
-rw-r--r--wpa_supplicant/hidl/1.2/sta_network.cpp8
1 files changed, 0 insertions, 8 deletions
diff --git a/wpa_supplicant/hidl/1.2/sta_network.cpp b/wpa_supplicant/hidl/1.2/sta_network.cpp
index 57622f83..4d694f71 100644
--- a/wpa_supplicant/hidl/1.2/sta_network.cpp
+++ b/wpa_supplicant/hidl/1.2/sta_network.cpp
@@ -2131,10 +2131,6 @@ int StaNetwork::setByteArrayKeyFieldAndResetState(
*/
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::setFastTransitionKeyMgmt(uint32_t &key_mgmt_mask)
*/
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;
}