release-request-1402554e-13f6-4a8a-ac43-0c3cb703879f-for-git_oc-dr1-release-4022446 snap-temp-L41400000065417041

Change-Id: I03b1654511b0ac0187fb691a462f45be5840a1fe

22 files changed, 19 insertions, 13 deletions

diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk
index 04868f4e..867af85a 100644
--- a/wpa_supplicant/Android.mk
+++ b/wpa_supplicant/Android.mk
@@ -1681,20 +1681,23 @@ LOCAL_MODULE := libwpa_hidl
 LOCAL_CPPFLAGS := $(L_CPPFLAGS)
 LOCAL_CFLAGS := $(L_CFLAGS)
 LOCAL_C_INCLUDES := $(INCLUDES)
+HIDL_INTERFACE_VERSION = 1.0
 LOCAL_SRC_FILES := \
-    hidl/hidl.cpp \
-    hidl/hidl_manager.cpp \
-    hidl/iface_config_utils.cpp \
-    hidl/p2p_iface.cpp \
-    hidl/p2p_network.cpp \
-    hidl/sta_iface.cpp \
-    hidl/sta_network.cpp \
-    hidl/supplicant.cpp
+    hidl/$(HIDL_INTERFACE_VERSION)/hidl.cpp \
+    hidl/$(HIDL_INTERFACE_VERSION)/hidl_manager.cpp \
+    hidl/$(HIDL_INTERFACE_VERSION)/iface_config_utils.cpp \
+    hidl/$(HIDL_INTERFACE_VERSION)/p2p_iface.cpp \
+    hidl/$(HIDL_INTERFACE_VERSION)/p2p_network.cpp \
+    hidl/$(HIDL_INTERFACE_VERSION)/sta_iface.cpp \
+    hidl/$(HIDL_INTERFACE_VERSION)/sta_network.cpp \
+    hidl/$(HIDL_INTERFACE_VERSION)/supplicant.cpp
 LOCAL_SHARED_LIBRARIES := \
-    android.hardware.wifi.supplicant@1.0 \
+    android.hardware.wifi.supplicant@$(HIDL_INTERFACE_VERSION) \
     libhidlbase \
     libhidltransport \
     libhwbinder \
     libutils
+LOCAL_EXPORT_C_INCLUDE_DIRS := \
+    $(LOCAL_PATH)/hidl/$(HIDL_INTERFACE_VERSION)
 include $(BUILD_STATIC_LIBRARY)
 endif # WPA_SUPPLICANT_USE_HIDL == y
diff --git a/wpa_supplicant/hidl/hidl.cpp b/wpa_supplicant/hidl/1.0/hidl.cpp
index e5f5303b..e5f5303b 100644
--- a/wpa_supplicant/hidl/hidl.cpp
+++ b/wpa_supplicant/hidl/1.0/hidl.cpp
diff --git a/wpa_supplicant/hidl/hidl.h b/wpa_supplicant/hidl/1.0/hidl.h
index 96631f28..96631f28 100644
--- a/wpa_supplicant/hidl/hidl.h
+++ b/wpa_supplicant/hidl/1.0/hidl.h
diff --git a/wpa_supplicant/hidl/hidl_constants.h b/wpa_supplicant/hidl/1.0/hidl_constants.h
index 988a5900..988a5900 100644
--- a/wpa_supplicant/hidl/hidl_constants.h
+++ b/wpa_supplicant/hidl/1.0/hidl_constants.h
diff --git a/wpa_supplicant/hidl/hidl_i.h b/wpa_supplicant/hidl/1.0/hidl_i.h
index c7a01423..c7a01423 100644
--- a/wpa_supplicant/hidl/hidl_i.h
+++ b/wpa_supplicant/hidl/1.0/hidl_i.h
diff --git a/wpa_supplicant/hidl/hidl_manager.cpp b/wpa_supplicant/hidl/1.0/hidl_manager.cpp
index 72b53a4d..72b53a4d 100644
--- a/wpa_supplicant/hidl/hidl_manager.cpp
+++ b/wpa_supplicant/hidl/1.0/hidl_manager.cpp
diff --git a/wpa_supplicant/hidl/hidl_manager.h b/wpa_supplicant/hidl/1.0/hidl_manager.h
index 9d9527cb..9d9527cb 100644
--- a/wpa_supplicant/hidl/hidl_manager.h
+++ b/wpa_supplicant/hidl/1.0/hidl_manager.h
diff --git a/wpa_supplicant/hidl/hidl_return_util.h b/wpa_supplicant/hidl/1.0/hidl_return_util.h
index c077fc89..c077fc89 100644
--- a/wpa_supplicant/hidl/hidl_return_util.h
+++ b/wpa_supplicant/hidl/1.0/hidl_return_util.h
diff --git a/wpa_supplicant/hidl/iface_config_utils.cpp b/wpa_supplicant/hidl/1.0/iface_config_utils.cpp
index 7dc5a6c7..7dc5a6c7 100644
--- a/wpa_supplicant/hidl/iface_config_utils.cpp
+++ b/wpa_supplicant/hidl/1.0/iface_config_utils.cpp
diff --git a/wpa_supplicant/hidl/iface_config_utils.h b/wpa_supplicant/hidl/1.0/iface_config_utils.h
index 789cc388..789cc388 100644
--- a/wpa_supplicant/hidl/iface_config_utils.h
+++ b/wpa_supplicant/hidl/1.0/iface_config_utils.h
diff --git a/wpa_supplicant/hidl/misc_utils.h b/wpa_supplicant/hidl/1.0/misc_utils.h
index 354ec328..354ec328 100644
--- a/wpa_supplicant/hidl/misc_utils.h
+++ b/wpa_supplicant/hidl/1.0/misc_utils.h
diff --git a/wpa_supplicant/hidl/p2p_iface.cpp b/wpa_supplicant/hidl/1.0/p2p_iface.cpp
index 1dddb340..252266ba 100644
--- a/wpa_supplicant/hidl/p2p_iface.cpp
+++ b/wpa_supplicant/hidl/1.0/p2p_iface.cpp
@@ -24,6 +24,7 @@ const char kConfigMethodStrDisplay[] = "display";
 const char kConfigMethodStrKeypad[] = "keypad";
 constexpr char kSetMiracastMode[] = "MIRACAST ";
 constexpr uint8_t kWfdDeviceInfoSubelemId = 0;
+constexpr char kWfdDeviceInfoSubelemLenHexStr[] = "0006";
 
 using android::hardware::wifi::supplicant::V1_0::ISupplicantP2pIface;
 uint8_t convertHidlMiracastModeToInternal(
@@ -1138,14 +1139,16 @@ SupplicantStatus P2pIface::setWfdDeviceInfoInternal(
     const std::array<uint8_t, 6>& info)
 {
 	struct wpa_supplicant* wpa_s = retrieveIfacePtr();
-	uint32_t wfd_device_info_hex_len = info.size() * 2 + 1;
-	std::vector<char> wfd_device_info_hex(wfd_device_info_hex_len);
+	std::vector<char> wfd_device_info_hex(info.size() * 2 + 1);
 	wpa_snprintf_hex(
 	    wfd_device_info_hex.data(), wfd_device_info_hex.size(), info.data(),
 	    info.size());
+	// |wifi_display_subelem_set| expects the first 2 bytes
+	// to hold the lenght of the subelement. In this case it's
+	// fixed to 6, so prepend that.
 	std::string wfd_device_info_set_cmd_str =
 	    std::to_string(kWfdDeviceInfoSubelemId) + " " +
-	    wfd_device_info_hex.data();
+	    kWfdDeviceInfoSubelemLenHexStr + wfd_device_info_hex.data();
 	std::vector<char> wfd_device_info_set_cmd(
 	    wfd_device_info_set_cmd_str.c_str(),
 	    wfd_device_info_set_cmd_str.c_str() +
diff --git a/wpa_supplicant/hidl/p2p_iface.h b/wpa_supplicant/hidl/1.0/p2p_iface.h
index 4f4a79d4..4f4a79d4 100644
--- a/wpa_supplicant/hidl/p2p_iface.h
+++ b/wpa_supplicant/hidl/1.0/p2p_iface.h
diff --git a/wpa_supplicant/hidl/p2p_network.cpp b/wpa_supplicant/hidl/1.0/p2p_network.cpp
index 7daa4539..7daa4539 100644
--- a/wpa_supplicant/hidl/p2p_network.cpp
+++ b/wpa_supplicant/hidl/1.0/p2p_network.cpp
diff --git a/wpa_supplicant/hidl/p2p_network.h b/wpa_supplicant/hidl/1.0/p2p_network.h
index 6164f430..6164f430 100644
--- a/wpa_supplicant/hidl/p2p_network.h
+++ b/wpa_supplicant/hidl/1.0/p2p_network.h
diff --git a/wpa_supplicant/hidl/sta_iface.cpp b/wpa_supplicant/hidl/1.0/sta_iface.cpp
index 8498e69c..8498e69c 100644
--- a/wpa_supplicant/hidl/sta_iface.cpp
+++ b/wpa_supplicant/hidl/1.0/sta_iface.cpp
diff --git a/wpa_supplicant/hidl/sta_iface.h b/wpa_supplicant/hidl/1.0/sta_iface.h
index 6e622601..6e622601 100644
--- a/wpa_supplicant/hidl/sta_iface.h
+++ b/wpa_supplicant/hidl/1.0/sta_iface.h
diff --git a/wpa_supplicant/hidl/sta_network.cpp b/wpa_supplicant/hidl/1.0/sta_network.cpp
index 72185b30..72185b30 100644
--- a/wpa_supplicant/hidl/sta_network.cpp
+++ b/wpa_supplicant/hidl/1.0/sta_network.cpp
diff --git a/wpa_supplicant/hidl/sta_network.h b/wpa_supplicant/hidl/1.0/sta_network.h
index 6e8d42b4..6e8d42b4 100644
--- a/wpa_supplicant/hidl/sta_network.h
+++ b/wpa_supplicant/hidl/1.0/sta_network.h
diff --git a/wpa_supplicant/hidl/supplicant.cpp b/wpa_supplicant/hidl/1.0/supplicant.cpp
index 409547f0..409547f0 100644
--- a/wpa_supplicant/hidl/supplicant.cpp
+++ b/wpa_supplicant/hidl/1.0/supplicant.cpp
diff --git a/wpa_supplicant/hidl/supplicant.h b/wpa_supplicant/hidl/1.0/supplicant.h
index 1ad84024..1ad84024 100644
--- a/wpa_supplicant/hidl/supplicant.h
+++ b/wpa_supplicant/hidl/1.0/supplicant.h
diff --git a/wpa_supplicant/notify.c b/wpa_supplicant/notify.c
index c720c321..9464c4b9 100644
--- a/wpa_supplicant/notify.c
+++ b/wpa_supplicant/notify.c
@@ -23,7 +23,7 @@
 #include "p2p_supplicant.h"
 #include "sme.h"
 #include "notify.h"
-#include "hidl/hidl.h"
+#include "hidl.h"
 
 int wpas_notify_supplicant_initialized(struct wpa_global *global)
 {