aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2020-01-16 18:36:32 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-01-16 18:36:32 +0000
commit270285747472a0260ce64a3624c77a2fd1038fd2 (patch)
tree36fb82cbc1d4510abb07518ad1f7fbe1089b9f31
parentb9aeb5ddb112bc24ec63de9a2c8c16ad98519b3c (diff)
parent2a97b67a8928daf0a4bfd8ddf1ccee8e9336206a (diff)
downloadwpa_supplicant_8-270285747472a0260ce64a3624c77a2fd1038fd2.tar.gz
Merge "Wifi: Deliver eap error code"
-rw-r--r--wpa_supplicant/hidl/1.3/hidl_manager.cpp19
1 files changed, 3 insertions, 16 deletions
diff --git a/wpa_supplicant/hidl/1.3/hidl_manager.cpp b/wpa_supplicant/hidl/1.3/hidl_manager.cpp
index 793757b2..120f2d38 100644
--- a/wpa_supplicant/hidl/1.3/hidl_manager.cpp
+++ b/wpa_supplicant/hidl/1.3/hidl_manager.cpp
@@ -1431,27 +1431,14 @@ void HidlManager::notifyExtRadioWorkTimeout(
void HidlManager::notifyEapError(struct wpa_supplicant *wpa_s, int error_code)
{
- typedef V1_1::ISupplicantStaIfaceCallback::EapErrorCode EapErrorCode;
-
if (!wpa_s)
return;
- switch (static_cast<EapErrorCode>(error_code)) {
- case EapErrorCode::SIM_GENERAL_FAILURE_AFTER_AUTH:
- case EapErrorCode::SIM_TEMPORARILY_DENIED:
- case EapErrorCode::SIM_NOT_SUBSCRIBED:
- case EapErrorCode::SIM_GENERAL_FAILURE_BEFORE_AUTH:
- case EapErrorCode::SIM_VENDOR_SPECIFIC_EXPIRED_CERT:
- break;
- default:
- return;
- }
-
- callWithEachStaIfaceCallback_1_1(
+ callWithEachStaIfaceCallback_1_3(
wpa_s->ifname,
std::bind(
- &V1_1::ISupplicantStaIfaceCallback::onEapFailure_1_1,
- std::placeholders::_1, static_cast<EapErrorCode>(error_code)));
+ &V1_3::ISupplicantStaIfaceCallback::onEapFailure_1_3,
+ std::placeholders::_1, error_code));
}
/**