commit 476153cc507122ee9ca5c5613b27be92e00696dc
author Jouni Malinen <j@w1.fi> Mon Oct 16 18:28:34 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Oct 16 18:28:34 2017 +0000
tree 25054c3433bc9948f02f54c2cbb25f1e71211410
parent 782d261b1faf151d98031fffabc9d6864acdb76f
parent 3f4b04ca3a651e3bf22c6bb94e47dea8d312e108

Merge changes Ic94024e8,Ib1276336,Iaf052e2d,Ic951a6fc,I8e6f16cb, ... am: 7b6dd6cf9d am: b4ed6b6784  -s ours
am: 3f4b04ca3a  -s ours

Change-Id: I4fb8101297d623cc6a372bd90b3992723dadbe83

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