commit 6d2b5515f8610dbfabaaa3e33a8d511976b4bf28
author Jouni Malinen <j@w1.fi> Thu Oct 19 00:40:51 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Oct 19 00:40:51 2017 +0000
tree 25054c3433bc9948f02f54c2cbb25f1e71211410
parent 04b4a7f1f0deb7ec49053b88a5caeadb65f0fabe
parent 58f6d8752ccffc54541db9672927576ca59899b0

Fix PTK rekeying to generate a new ANonce am: e52ae8e63a am: a1f3ac5a6e  -s ours am: 36dc61025b  -s ours am: 66cf8e0f1e  -s ours am: a1a392bfd4  -s ours am: 9e44f88253  -s ours am: 2fc627faae  -s ours am: 72f303c62b  -s ours am: e24998d0ec  -s ours am: 37dbf4894d  -s ours am: 758ed7d4e7  -s ours am: 7e8bf5031c  -s ours am: f2f9856721  -s ours
am: 58f6d8752c  -s ours

Change-Id: I34e0f00d13c51c58daf6fb4fbce1d185f8fe96bb

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