Merge "[wpa_supplicant] Cumulative patch from commit ac1e3a7f0"
diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk
index f276c48..cdf8943 100644
--- a/wpa_supplicant/Android.mk
+++ b/wpa_supplicant/Android.mk
@@ -8,7 +8,7 @@
LOCAL_PATH := $(call my-dir)
PKG_CONFIG ?= pkg-config
-$(eval $(call declare-copy-files-license-metadata,external/wpa_supplicant_8/wpa_supplicant,.conf,SPDX-license-identifier-BSD-3-Clause,notice,external/wpa_supplicant_8/wpa_supplicant/LICENSE_BSD,))
+$(eval $(call declare-copy-files-license-metadata,external/wpa_supplicant_8/wpa_supplicant,.conf,SPDX-license-identifier-BSD-3-Clause,notice,external/wpa_supplicant_8/LICENSE,))
ifneq ($(BOARD_WPA_SUPPLICANT_DRIVER),)
CONFIG_DRIVER_$(BOARD_WPA_SUPPLICANT_DRIVER) := y
diff --git a/wpa_supplicant/aidl/aidl_manager.cpp b/wpa_supplicant/aidl/aidl_manager.cpp
index 04e84b4..f9f0412 100644
--- a/wpa_supplicant/aidl/aidl_manager.cpp
+++ b/wpa_supplicant/aidl/aidl_manager.cpp
@@ -1546,7 +1546,7 @@
misc_utils::charBufToString(wpa_s->ifname),
std::bind(
&ISupplicantStaIfaceCallback::onEapFailure,
- std::placeholders::_1, error_code));
+ std::placeholders::_1, std::vector<uint8_t>(), error_code));
}
/**
diff --git a/wpa_supplicant/aidl/sta_iface.cpp b/wpa_supplicant/aidl/sta_iface.cpp
index 084ea2c..f382285 100644
--- a/wpa_supplicant/aidl/sta_iface.cpp
+++ b/wpa_supplicant/aidl/sta_iface.cpp
@@ -788,13 +788,13 @@
}
::ndk::ScopedAStatus StaIface::sendQosPolicyResponse(
- bool in_morePolicies,
+ int32_t in_qosPolicyRequestId, bool in_morePolicies,
const std::vector<QosPolicyStatus>& in_qosPolicyStatusList)
{
return validateAndCall(
this, SupplicantStatusCode::FAILURE_UNKNOWN,
- &StaIface::sendQosPolicyResponseInternal, in_morePolicies,
- in_qosPolicyStatusList);
+ &StaIface::sendQosPolicyResponseInternal, in_qosPolicyRequestId,
+ in_morePolicies, in_qosPolicyStatusList);
}
::ndk::ScopedAStatus StaIface::removeAllQosPolicies()
@@ -1809,7 +1809,8 @@
}
ndk::ScopedAStatus StaIface::sendQosPolicyResponseInternal(
- bool more_policies, const std::vector<QosPolicyStatus>& qos_policy_status_list)
+ int32_t qos_policy_request_id, bool more_policies,
+ const std::vector<QosPolicyStatus>& qos_policy_status_list)
{
return ndk::ScopedAStatus::ok();
}
diff --git a/wpa_supplicant/aidl/sta_iface.h b/wpa_supplicant/aidl/sta_iface.h
index 44e3ef5..0ed29d8 100644
--- a/wpa_supplicant/aidl/sta_iface.h
+++ b/wpa_supplicant/aidl/sta_iface.h
@@ -153,7 +153,8 @@
const std::string& in_ssid, const std::vector<uint8_t>& in_privEcKey) override;
::ndk::ScopedAStatus setQosPolicyFeatureEnabled(bool in_enable) override;
::ndk::ScopedAStatus sendQosPolicyResponse(
- bool in_morePolicies, const std::vector<QosPolicyStatus>& in_qosPolicyStatusList) override;
+ int32_t in_qosPolicyRequestId, bool in_morePolicies,
+ const std::vector<QosPolicyStatus>& in_qosPolicyStatusList) override;
::ndk::ScopedAStatus removeAllQosPolicies() override;
::ndk::ScopedAStatus getConnectionMloLinksInfo(MloLinksInfo* _aidl_return) override;
@@ -256,7 +257,8 @@
const std::string& ssid, const std::vector<uint8_t> &privEcKey);
ndk::ScopedAStatus setQosPolicyFeatureEnabledInternal(bool enable);
ndk::ScopedAStatus sendQosPolicyResponseInternal(
- bool more_policies, const std::vector<QosPolicyStatus>& qos_policy_status_list);
+ int32_t qos_policy_request_id, bool more_policies,
+ const std::vector<QosPolicyStatus>& qos_policy_status_list);
ndk::ScopedAStatus removeAllQosPoliciesInternal();
std::pair<MloLinksInfo, ndk::ScopedAStatus> getConnectionMloLinksInfoInternal();
struct wpa_supplicant* retrieveIfacePtr();
diff --git a/wpa_supplicant/aidl/supplicant.cpp b/wpa_supplicant/aidl/supplicant.cpp
index 208491c..ee6f809 100644
--- a/wpa_supplicant/aidl/supplicant.cpp
+++ b/wpa_supplicant/aidl/supplicant.cpp
@@ -144,7 +144,8 @@
return -1;
}
const char* path =
- resolvePath(kTemplateConfPaths, sizeof(kTemplateConfPaths));
+ resolvePath(kTemplateConfPaths,
+ sizeof(kTemplateConfPaths)/sizeof(kTemplateConfPaths[0]));
if (path != nullptr) {
ret = copyFileIfItExists(path, config_file_path);
if (ret == 0) {
@@ -342,7 +343,7 @@
iface_params.confname = kP2pIfaceConfPath;
const char* path = resolvePath(
kP2pIfaceConfOverlayPaths,
- sizeof(kP2pIfaceConfOverlayPaths));
+ sizeof(kP2pIfaceConfOverlayPaths)/sizeof(kP2pIfaceConfOverlayPaths[0]));
if (path != nullptr) {
iface_params.confanother = path;
}
@@ -402,7 +403,7 @@
iface_params.confname = kStaIfaceConfPath;
const char* path = resolvePath(
kStaIfaceConfOverlayPaths,
- sizeof(kStaIfaceConfOverlayPaths));
+ sizeof(kStaIfaceConfOverlayPaths)/sizeof(kStaIfaceConfOverlayPaths[0]));
if (path != nullptr) {
iface_params.confanother = path;
}