commit c5794f2ab28ac80a2ae48802f11d83777b8794c8
author Mathy Vanhoef <Mathy.Vanhoef@cs.kuleuven.be> Thu Oct 19 00:40:30 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Oct 19 00:40:30 2017 +0000
tree 25054c3433bc9948f02f54c2cbb25f1e71211410
parent a90e7c80a71fb4ea642da8b85dbd3144e91c2a01
parent b5598ff9ff27657949035e0e1cdcbb460c7bb4f2

Prevent installation of an all-zero TK am: b2703a28a5 am: 1fc6c1c035  -s ours am: 7fd3e84d11  -s ours am: 84b3018e84  -s ours am: b23a1ccff1  -s ours am: 5209c04030  -s ours am: d2f6f33a1e  -s ours am: 4bde393319  -s ours am: dce22db74e  -s ours am: ad41138c4b  -s ours am: 8d6b9e705b  -s ours am: 2d5a3b86be  -s ours am: a4d6c0b563  -s ours
am: b5598ff9ff  -s ours

Change-Id: Ia9e4f1266e5d48cf5e04a7feed6b946bd150aaa2

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