commit fb5616f107a427fa06b842589d84f441c4510913
author Roshan Pius <rpius@google.com> Mon Jan 30 22:18:19 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Jan 30 22:18:19 2017 +0000
tree b40f532a067bd747435f68d6c311476db0f9ad44
parent c9162c2f3d2512df4d5ff038edc61412d06c1d54
parent b2a748cd2101b918502403279e129890853a95f9

Merge "wpa_supplicant(hidl): Use macros for WPS param sizes" am: a16284d559 am: 48e3858d57 am: 0a12384136
am: b2a748cd21

Change-Id: I180e6075ab2efe6485a9322c3c4b330f7a5e732c

wpa_supplicant/hidl/iface_config_utils.cpp

diff --git a/wpa_supplicant/hidl/iface_config_utils.cpp b/wpa_supplicant/hidl/iface_config_utils.cpp
index 028eae8..643a97f 100644
--- a/wpa_supplicant/hidl/iface_config_utils.cpp
+++ b/wpa_supplicant/hidl/iface_config_utils.cpp
@@ -15,10 +15,10 @@
 
 namespace {
 constexpr uint32_t kMaxWpsDeviceNameSize = WPS_DEV_NAME_MAX_LEN;
-constexpr uint32_t kMaxWpsManufacturerSize = 64;
-constexpr uint32_t kMaxWpsModelNameSize = 32;
-constexpr uint32_t kMaxWpsModelNumberSize = 32;
-constexpr uint32_t kMaxWpsSerialNumberSize = 32;
+constexpr uint32_t kMaxWpsManufacturerSize = WPS_MANUFACTURER_MAX_LEN;
+constexpr uint32_t kMaxWpsModelNameSize = WPS_MODEL_NAME_MAX_LEN;
+constexpr uint32_t kMaxWpsModelNumberSize = WPS_MODEL_NUMBER_MAX_LEN;
+constexpr uint32_t kMaxWpsSerialNumberSize = WPS_SERIAL_NUMBER_MAX_LEN;
 
 void processConfigUpdate(struct wpa_supplicant* wpa_s, uint32_t changed_param)
 {