Fix TK configuration to the driver in EAPOL-Key 3/4 retry case am: 3843d1babe am: fcd43c368f -s ours am: cfd982727a -s ours am: e1f56dbdf5 -s ours am: 3c38c241e2 -s ours am: 7535bd5dfd -s ours am: 776fff318d -s ours am: c711fd5d1c -s ours am: 7e62ba6e0f -s ours am: 9ba7c469ed -s ours am: 330938206a -s ours am: 3f383ce5f8 -s ours am: 315cc2d9b5 -s ours
am: 57abc3376a -s ours
Change-Id: Ice564725affeefefad7a395223d54ee413df3f4a
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))));
}
/**