Extend protection of GTK/IGTK reinstallation of WNM-Sleep Mode cases am: af1b1a2118 am: 83b7bd2ef9 -s ours am: 8b76702941 -s ours am: 53ab24a09b -s ours am: ef522b708c -s ours am: d8b0597517 -s ours am: a604476d76 -s ours am: fd7702d085 -s ours am: 2a09ba6a5c -s ours am: 5fc2323333 -s ours am: 4b5a5819bc -s ours am: 7126b64a4a -s ours am: a4e862b3ee -s ours
am: 46ee066db4 -s ours
Change-Id: Icdf19434cab2fa27d01f76222ef3bcb2912dc674
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)
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))));
}
/**