Merge "[AWARE] Add support for instant communication mode" (77d3ff36) · Commits · e / os / android_hardware_interfaces

wifi/1.0/vts/functional/Android.bp

+5 −0

Original line number	Diff line number	Diff line
		@@ -73,6 +73,11 @@ cc_test {
		static_libs: [
		"VtsHalWifiV1_0TargetTestUtil",
		"android.hardware.wifi@1.0",
		"android.hardware.wifi@1.1",
		"android.hardware.wifi@1.2",
		"android.hardware.wifi@1.3",
		"android.hardware.wifi@1.4",
		"android.hardware.wifi@1.5",
		"libwifi-system-iface",
		],
		test_suites: [

wifi/1.0/vts/functional/wifi_nan_iface_hidl_test.cpp

+11 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@
		#include <android/hardware/wifi/1.0/IWifi.h>
		#include <android/hardware/wifi/1.0/IWifiNanIface.h>
		#include <android/hardware/wifi/1.0/IWifiNanIfaceEventCallback.h>
		#include <android/hardware/wifi/1.5/IWifiNanIface.h>
		#include <gtest/gtest.h>
		#include <hidl/GtestPrinter.h>
		#include <hidl/ServiceManagement.h>
		@@ -483,6 +484,16 @@ TEST_P(WifiNanIfaceHidlTest, FailOnIfaceInvalid) {
		TEST_P(WifiNanIfaceHidlTest, getCapabilitiesRequest) {
		uint16_t inputCmdId = 10;
		callbackType = INVALID;
		sp<::android::hardware::wifi::V1_5::IWifiNanIface> iface_converted =
		::android::hardware::wifi::V1_5::IWifiNanIface::castFrom(iwifiNanIface);
		if (iface_converted != nullptr) {
		ASSERT_EQ(WifiStatusCode::ERROR_NOT_SUPPORTED,
		HIDL_INVOKE(iwifiNanIface, getCapabilitiesRequest, inputCmdId)
		.code);
		// Skip this test since this API is deprecated in this newer HAL version
		return;
		}

		ASSERT_EQ(
		WifiStatusCode::SUCCESS,
		HIDL_INVOKE(iwifiNanIface, getCapabilitiesRequest, inputCmdId).code);

wifi/1.4/vts/functional/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -52,6 +52,7 @@ cc_test {
		"android.hardware.wifi@1.2",
		"android.hardware.wifi@1.3",
		"android.hardware.wifi@1.4",
		"android.hardware.wifi@1.5",
		"libwifi-system-iface",
		],
		test_suites: [

wifi/1.4/vts/functional/wifi_nan_iface_hidl_test.cpp

+46 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@
		#include <android/hardware/wifi/1.2/IWifiNanIfaceEventCallback.h>
		#include <android/hardware/wifi/1.4/IWifi.h>
		#include <android/hardware/wifi/1.4/IWifiNanIface.h>
		#include <android/hardware/wifi/1.5/IWifiNanIface.h>
		#include <gtest/gtest.h>
		#include <hidl/GtestPrinter.h>
		#include <hidl/ServiceManagement.h>
		@@ -488,6 +489,17 @@ TEST_P(WifiNanIfaceHidlTest, enableRequest_1_4InvalidArgs) {
		callbackType = INVALID;
		::android::hardware::wifi::V1_4::NanEnableRequest nanEnableRequest = {};
		NanConfigRequestSupplemental nanConfigRequestSupp = {};

		sp<::android::hardware::wifi::V1_5::IWifiNanIface> iface_converted =
		::android::hardware::wifi::V1_5::IWifiNanIface::castFrom(iwifiNanIface);
		if (iface_converted != nullptr) {
		ASSERT_EQ(WifiStatusCode::ERROR_NOT_SUPPORTED,
		HIDL_INVOKE(iwifiNanIface, enableRequest_1_4, inputCmdId,
		nanEnableRequest, nanConfigRequestSupp)
		.code);
		// Skip this test since this API is deprecated in this newer HAL version
		return;
		}
		ASSERT_EQ(WifiStatusCode::SUCCESS,
		HIDL_INVOKE(iwifiNanIface, enableRequest_1_4, inputCmdId,
		nanEnableRequest, nanConfigRequestSupp)
		@@ -509,6 +521,17 @@ TEST_P(WifiNanIfaceHidlTest, enableRequest_1_4ShimInvalidArgs) {
		nanEnableRequest.configParams.numberOfPublishServiceIdsInBeacon =
		128; // must be <= 127
		NanConfigRequestSupplemental nanConfigRequestSupp = {};

		sp<::android::hardware::wifi::V1_5::IWifiNanIface> iface_converted =
		::android::hardware::wifi::V1_5::IWifiNanIface::castFrom(iwifiNanIface);
		if (iface_converted != nullptr) {
		ASSERT_EQ(WifiStatusCode::ERROR_NOT_SUPPORTED,
		HIDL_INVOKE(iwifiNanIface, enableRequest_1_4, inputCmdId,
		nanEnableRequest, nanConfigRequestSupp)
		.code);
		// Skip this test since this API is deprecated in this newer HAL version
		return;
		}
		ASSERT_EQ(WifiStatusCode::ERROR_INVALID_ARGS,
		HIDL_INVOKE(iwifiNanIface, enableRequest_1_4, inputCmdId,
		nanEnableRequest, nanConfigRequestSupp)
		@@ -523,6 +546,17 @@ TEST_P(WifiNanIfaceHidlTest, configRequest_1_4InvalidArgs) {
		callbackType = INVALID;
		::android::hardware::wifi::V1_4::NanConfigRequest nanConfigRequest = {};
		NanConfigRequestSupplemental nanConfigRequestSupp = {};

		sp<::android::hardware::wifi::V1_5::IWifiNanIface> iface_converted =
		::android::hardware::wifi::V1_5::IWifiNanIface::castFrom(iwifiNanIface);
		if (iface_converted != nullptr) {
		ASSERT_EQ(WifiStatusCode::ERROR_NOT_SUPPORTED,
		HIDL_INVOKE(iwifiNanIface, configRequest_1_4, inputCmdId,
		nanConfigRequest, nanConfigRequestSupp)
		.code);
		// Skip this test since this API is deprecated in this newer HAL version
		return;
		}
		ASSERT_EQ(WifiStatusCode::SUCCESS,
		HIDL_INVOKE(iwifiNanIface, configRequest_1_4, inputCmdId,
		nanConfigRequest, nanConfigRequestSupp)
		@@ -543,6 +577,18 @@ TEST_P(WifiNanIfaceHidlTest, configRequest_1_4ShimInvalidArgs) {
		::android::hardware::wifi::V1_4::NanConfigRequest nanConfigRequest = {};
		nanConfigRequest.numberOfPublishServiceIdsInBeacon = 128; // must be <= 127
		NanConfigRequestSupplemental nanConfigRequestSupp = {};

		sp<::android::hardware::wifi::V1_5::IWifiNanIface> iface_converted =
		::android::hardware::wifi::V1_5::IWifiNanIface::castFrom(iwifiNanIface);
		if (iface_converted != nullptr) {
		ASSERT_EQ(WifiStatusCode::ERROR_NOT_SUPPORTED,
		HIDL_INVOKE(iwifiNanIface, configRequest_1_4, inputCmdId,
		nanConfigRequest, nanConfigRequestSupp)
		.code);
		// Skip this test since this API is deprecated in this newer HAL version
		return;
		}

		ASSERT_EQ(WifiStatusCode::ERROR_INVALID_ARGS,
		HIDL_INVOKE(iwifiNanIface, configRequest_1_4, inputCmdId,
		nanConfigRequest, nanConfigRequestSupp)

wifi/1.5/Android.bp

+2 −0

Original line number	Diff line number	Diff line
		@@ -7,6 +7,8 @@ hidl_interface {
		"types.hal",
		"IWifi.hal",
		"IWifiChip.hal",
		"IWifiNanIface.hal",
		"IWifiNanIfaceEventCallback.hal",
		],
		interfaces: [
		"android.hardware.wifi@1.0",