Merge "wpa_supplicant(hidl): Correct the Wfd length"
am: 1f0276019c
Change-Id: Ied99d0bbf76f57b26942b02c92c243d38ac06564
diff --git a/wpa_supplicant/hidl/hidl_manager.cpp b/wpa_supplicant/hidl/hidl_manager.cpp
index 861f489..2ba99bd 100644
--- a/wpa_supplicant/hidl/hidl_manager.cpp
+++ b/wpa_supplicant/hidl/hidl_manager.cpp
@@ -20,7 +20,7 @@
namespace {
using android::hardware::hidl_array;
-constexpr uint8_t kWfdDeviceInfoLen = 8;
+constexpr uint8_t kWfdDeviceInfoLen = 6;
// GSM-AUTH:<RAND1>:<RAND2>[:<RAND3>]
constexpr char kGsmAuthRegex2[] = "GSM-AUTH:([0-9a-f]+):([0-9a-f]+)";
constexpr char kGsmAuthRegex3[] =
diff --git a/wpa_supplicant/hidl/p2p_iface.cpp b/wpa_supplicant/hidl/p2p_iface.cpp
index ce9aaf7..50e1a33 100644
--- a/wpa_supplicant/hidl/p2p_iface.cpp
+++ b/wpa_supplicant/hidl/p2p_iface.cpp
@@ -456,7 +456,7 @@
}
Return<void> P2pIface::setWfdDeviceInfo(
- const hidl_array<uint8_t, 8>& info, setWfdDeviceInfo_cb _hidl_cb)
+ const hidl_array<uint8_t, 6>& info, setWfdDeviceInfo_cb _hidl_cb)
{
return validateAndCall(
this, SupplicantStatusCode::FAILURE_IFACE_INVALID,
@@ -1134,7 +1134,7 @@
}
SupplicantStatus P2pIface::setWfdDeviceInfoInternal(
- const std::array<uint8_t, 8>& info)
+ const std::array<uint8_t, 6>& info)
{
struct wpa_supplicant* wpa_s = retrieveIfacePtr();
uint32_t wfd_device_info_hex_len = info.size() * 2 + 1;
diff --git a/wpa_supplicant/hidl/p2p_iface.h b/wpa_supplicant/hidl/p2p_iface.h
index 4f08a78..4f4a79d 100644
--- a/wpa_supplicant/hidl/p2p_iface.h
+++ b/wpa_supplicant/hidl/p2p_iface.h
@@ -172,7 +172,7 @@
uint16_t config_methods, setWpsConfigMethods_cb _hidl_cb) override;
Return<void> enableWfd(bool enable, enableWfd_cb _hidl_cb) override;
Return<void> setWfdDeviceInfo(
- const hidl_array<uint8_t, 8>& info,
+ const hidl_array<uint8_t, 6>& info,
setWfdDeviceInfo_cb _hidl_cb) override;
Return<void> createNfcHandoverRequestMessage(
createNfcHandoverRequestMessage_cb _hidl_cb) override;
@@ -279,7 +279,7 @@
SupplicantStatus setWpsConfigMethodsInternal(uint16_t config_methods);
SupplicantStatus enableWfdInternal(bool enable);
SupplicantStatus setWfdDeviceInfoInternal(
- const std::array<uint8_t, 8>& info);
+ const std::array<uint8_t, 6>& info);
std::pair<SupplicantStatus, std::vector<uint8_t>>
createNfcHandoverRequestMessageInternal();
std::pair<SupplicantStatus, std::vector<uint8_t>>
