FT: Do not allow multiple Reassociation Response frames am: a8c406adc6 am: 64671549a7 -s ours am: 7e0b2fd585 -s ours am: 22dfeefa47 -s ours am: b31e26ab5b -s ours am: dc06e1a24d -s ours am: cfd5df4f7b -s ours am: ab92151967 -s ours am: 239349d340 -s ours am: 8028e0f544 -s ours am: ac564a68f3 -s ours am: 4a1f8dfedd -s ours am: b38a054ae2 -s ours
am: f90c2859e7 -s ours
Change-Id: I87bdd968f81affab42e133f720c8d0f3d368a9fe
diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk
index 867af85..4ca4281 100644
--- a/wpa_supplicant/Android.mk
+++ b/wpa_supplicant/Android.mk
@@ -1678,6 +1678,7 @@
########################
include $(CLEAR_VARS)
LOCAL_MODULE := libwpa_hidl
+LOCAL_VENDOR_MODULE := true
LOCAL_CPPFLAGS := $(L_CPPFLAGS)
LOCAL_CFLAGS := $(L_CFLAGS)
LOCAL_C_INCLUDES := $(INCLUDES)
@@ -1696,7 +1697,8 @@
libhidlbase \
libhidltransport \
libhwbinder \
- libutils
+ libutils \
+ liblog
LOCAL_EXPORT_C_INCLUDE_DIRS := \
$(LOCAL_PATH)/hidl/$(HIDL_INTERFACE_VERSION)
include $(BUILD_STATIC_LIBRARY)
diff --git a/wpa_supplicant/hidl/1.0/hidl_manager.cpp b/wpa_supplicant/hidl/1.0/hidl_manager.cpp
index 622dcbf..152203c 100644
--- a/wpa_supplicant/hidl/1.0/hidl_manager.cpp
+++ b/wpa_supplicant/hidl/1.0/hidl_manager.cpp
@@ -904,7 +904,7 @@
&ISupplicantStaIfaceCallback::onDisconnected,
std::placeholders::_1, bssid, wpa_s->disconnect_reason < 0,
static_cast<ISupplicantStaIfaceCallback::ReasonCode>(
- wpa_s->disconnect_reason)));
+ abs(wpa_s->disconnect_reason))));
}
/**