commit d74a63f3cbdc2cf12492a241d442739f6163cc47
author Jouni Malinen <j@w1.fi> Thu Oct 19 00:41:12 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Oct 19 00:41:12 2017 +0000
tree 25054c3433bc9948f02f54c2cbb25f1e71211410
parent 0fbbb3d39dde7f7c08ec2e51cb9a35baf328256b
parent 9598a1b28627b6e1ccf7d3c280245607297ca656

TDLS: Reject TPK-TK reconfiguration am: 4c52740a9b am: af26b03ad9  -s ours am: 2fe3833897  -s ours am: 1726f2febb  -s ours am: 6c23d5e07f  -s ours am: 6040f222ef  -s ours am: bc65f8bbcd  -s ours am: 172514b925  -s ours am: 44a284a72c  -s ours am: 32821e9555  -s ours am: bef32b9df8  -s ours am: 30e2e16362  -s ours am: ac54a0ad05  -s ours
am: 9598a1b286  -s ours

Change-Id: I21cee0dab6552195cde4abc1ffe79c44487ec9ef

wpa_supplicant/Android.mk

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)

wpa_supplicant/hidl/1.0/hidl_manager.cpp

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))));
 }
 
 /**