commit f80c4e591153a864a2d35053205cf69ef4a8b1b6
author Xin Li <delphij@google.com> Wed Dec 06 11:51:58 2017 -0800
committer Xin Li <delphij@google.com> Wed Dec 06 14:24:49 2017 -0800
tree e7e07144cbc9b03bb0f465fe7ef2dfe7088a562c
parent 4991f2ab66c360450ad0515cc76845264fe53f0d
parent e2617559d938e794c3104ce4d1dbeaf4e921ef36

DO NOT MERGE: Merge Oreo MR1 into master

Exempt-From-Owner-Approval: Changes already landed internally
Change-Id: I451d416af94c644b47a6ac983500e34ca56aaf41

wpa_supplicant/Android.mk

diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk
index 2165382..116270f 100644
--- a/wpa_supplicant/Android.mk
+++ b/wpa_supplicant/Android.mk
@@ -1766,6 +1766,7 @@
 ########################
 include $(CLEAR_VARS)
 LOCAL_MODULE := libwpa_hidl
+LOCAL_VENDOR_MODULE := true
 LOCAL_CPPFLAGS := $(L_CPPFLAGS)
 LOCAL_CFLAGS := $(L_CFLAGS)
 LOCAL_C_INCLUDES := $(INCLUDES)
@@ -1784,7 +1785,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))));
 }
 
 /**