Merge "Cumulative patch from commit 3d6953288b592704484864f41791f8c67ff9aa5a" am: 8ed76874ba
am: 9f86d83fec
Change-Id: I1d84f0b6c6cfe961db2f754e965a0e53f0a51813
diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk
index 41ba954..8606c4c 100644
--- a/wpa_supplicant/Android.mk
+++ b/wpa_supplicant/Android.mk
@@ -1745,6 +1745,7 @@
########################
include $(CLEAR_VARS)
LOCAL_MODULE := libwpa_hidl
+LOCAL_VENDOR_MODULE := true
LOCAL_CPPFLAGS := $(L_CPPFLAGS)
LOCAL_CFLAGS := $(L_CFLAGS)
LOCAL_C_INCLUDES := $(INCLUDES)
@@ -1763,7 +1764,8 @@
libhidlbase \
libhidltransport \
libhwbinder \
- libutils
+ libutils \
+ liblog
LOCAL_EXPORT_C_INCLUDE_DIRS := \
$(LOCAL_PATH)/hidl/$(HIDL_INTERFACE_VERSION)
include $(BUILD_STATIC_LIBRARY)
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))));
}
/**