Merge "Force EAP-TLSv1.2 for WPA3-Enterprise 192-bit RSA networks" into udc-dev
diff --git a/wpa_supplicant/aidl/sta_iface.cpp b/wpa_supplicant/aidl/sta_iface.cpp
index 029b99a..7538504 100644
--- a/wpa_supplicant/aidl/sta_iface.cpp
+++ b/wpa_supplicant/aidl/sta_iface.cpp
@@ -837,14 +837,6 @@
&StaIface::removeQosPolicyForScsInternal, _aidl_return, in_scsPolicyIds);
}
-::ndk::ScopedAStatus StaIface::removeAllQosPoliciesForScs(
- std::vector<QosPolicyScsRequestStatus>* _aidl_return)
-{
- return validateAndCall(
- this, SupplicantStatusCode::FAILURE_UNKNOWN,
- &StaIface::removeAllQosPoliciesForScsInternal, _aidl_return);
-}
-
std::pair<std::string, ndk::ScopedAStatus> StaIface::getNameInternal()
{
return {ifname_, ndk::ScopedAStatus::ok()};
@@ -2104,13 +2096,6 @@
createStatus(SupplicantStatusCode::FAILURE_UNSUPPORTED)};
}
-std::pair<std::vector<QosPolicyScsRequestStatus>, ndk::ScopedAStatus>
-StaIface::removeAllQosPoliciesForScsInternal()
-{
- return {std::vector<QosPolicyScsRequestStatus>(),
- createStatus(SupplicantStatusCode::FAILURE_UNSUPPORTED)};
-}
-
/**
* Retrieve the underlying |wpa_supplicant| struct
* pointer for this iface.
diff --git a/wpa_supplicant/aidl/sta_iface.h b/wpa_supplicant/aidl/sta_iface.h
index 88c6e45..db91445 100644
--- a/wpa_supplicant/aidl/sta_iface.h
+++ b/wpa_supplicant/aidl/sta_iface.h
@@ -165,8 +165,6 @@
::ndk::ScopedAStatus removeQosPolicyForScs(
const std::vector<uint8_t>& in_scsPolicyIds,
std::vector<QosPolicyScsRequestStatus>* _aidl_return) override;
- ::ndk::ScopedAStatus removeAllQosPoliciesForScs(
- std::vector<QosPolicyScsRequestStatus>* _aidl_return) override;
private:
// Corresponding worker functions for the AIDL methods.
@@ -279,8 +277,6 @@
std::pair<std::vector<QosPolicyScsRequestStatus>, ndk::ScopedAStatus>
removeQosPolicyForScsInternal(
const std::vector<uint8_t>& scsPolicyIds);
- std::pair<std::vector<QosPolicyScsRequestStatus>, ndk::ScopedAStatus>
- removeAllQosPoliciesForScsInternal();
struct wpa_supplicant* retrieveIfacePtr();