Merge "wifi: Support 11b only mode" (224b0b70) · Commits · e / os / android_hardware_interfaces

current.txt

+3 −0

Original line number	Diff line number	Diff line
		@@ -777,3 +777,6 @@ cd84ab19c590e0e73dd2307b591a3093ee18147ef95e6d5418644463a6620076 android.hardwar
		# HALs released in Android S
		# NOTE: waiting to freeze HALs until later in the release
		# NOTE: new HALs are recommended to be in AIDL
		57d183b10b13ec0a8e542c0b3d61991ae541c60e85dbbc5499bb21dfd068cbb8 android.hardware.wifi.supplicant@1.4::types
		17818b6b1952a75e4364ae82c534b9d2f5c0a9765a56256b16faa5a5cf45d3a8 android.hardware.wifi.supplicant@1.4::ISupplicant
		8342b5f6ec8f48ad2b741128aede010995d0b5709257b7ec09bb469b4f61ef1a android.hardware.wifi.supplicant@1.4::ISupplicantStaIface

+5 −1

Original line number	Diff line number	Diff line
		@@ -353,7 +353,11 @@ TEST_P(SupplicantStaIfaceHidlTest, GetConnectionCapabilities) {
		sta_iface_->getConnectionCapabilities(
		[&](const SupplicantStatus& status,
		ConnectionCapabilities /* capabilities */) {
		// Since getConnectionCapabilities() is overridden by an
		// upgraded API in newer HAL versions, allow for FAILURE_UNKNOWN
		if (status.code != SupplicantStatusCode::FAILURE_UNKNOWN) {
		EXPECT_EQ(SupplicantStatusCode::SUCCESS, status.code);
		}
		});
		}

+2 −0

Original line number	Diff line number	Diff line
		@@ -4,7 +4,9 @@ hidl_interface {
		name: "android.hardware.wifi.supplicant@1.4",
		root: "android.hardware",
		srcs: [
		"types.hal",
		"ISupplicant.hal",
		"ISupplicantStaIface.hal",
		],
		interfaces: [
		"android.hardware.wifi.supplicant@1.0",

0 → 100644

+39 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright 2020 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.hardware.wifi.supplicant@1.4;

		import @1.0::SupplicantStatus;
		import @1.3::ISupplicantStaIface;

		/**
		* Interface exposed by the supplicant for each station mode network
		* interface (e.g wlan0) it controls.
		*/
		interface ISupplicantStaIface extends @1.3::ISupplicantStaIface {

		/**
		* Get Connection capabilities
		*
		* @return status Status of the operation, and connection capabilities.
		* Possible status codes:
		* \|SupplicantStatusCode.SUCCESS\|,
		* \|SupplicantStatusCode.FAILURE_UNKNOWN\|,
		*/
		getConnectionCapabilities_1_4()
		generates (SupplicantStatus status, ConnectionCapabilities capabilities);

		};

0 → 100644

+52 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright 2020 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.hardware.wifi.supplicant@1.4;

		import @1.3::ConnectionCapabilities;

		/**
		* Detailed network mode for legacy network
		*/
		enum LegacyMode : uint32_t {
		UNKNOWN = 0,
		/**
		* For 802.11a
		*/
		A_MODE = 1,
		/**
		* For 802.11b
		*/
		B_MODE = 2,
		/**
		* For 802.11g
		*/
		G_MODE = 3,
		};

		/**
		* Connection Capabilities supported by current network and device
		*/
		struct ConnectionCapabilities {
		/**
		* Baseline information as defined in HAL 1.3.
		*/
		@1.3::ConnectionCapabilities V1_3;
		/**
		* detailed network mode for legacy network
		*/
		LegacyMode legacyMode;
		};