Merge changes from topic "MLO Scoring" (f66627d0) · Commits · e / os / android_hardware_interfaces

wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/IWifiChip.aidl

+1 −0

Original line number	Diff line number	Diff line
		@@ -59,6 +59,7 @@ interface IWifiChip {
		@PropagateAllowBlocking android.hardware.wifi.IWifiStaIface getStaIface(in String ifname);
		String[] getStaIfaceNames();
		android.hardware.wifi.WifiRadioCombinationMatrix getSupportedRadioCombinationsMatrix();
		android.hardware.wifi.WifiChipCapabilities getWifiChipCapabilities();
		android.hardware.wifi.WifiUsableChannel[] getUsableChannels(in android.hardware.wifi.WifiBand band, in android.hardware.wifi.WifiIfaceMode ifaceModeMask, in android.hardware.wifi.IWifiChip.UsableChannelFilter filterMask);
		void registerEventCallback(in android.hardware.wifi.IWifiChipEventCallback callback);
		void removeApIface(in String ifname);

wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/WifiChipCapabilities.aidl

0 → 100644

+39 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2022 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.
		*/
		///////////////////////////////////////////////////////////////////////////////
		// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. //
		///////////////////////////////////////////////////////////////////////////////

		// This file is a snapshot of an AIDL file. Do not edit it manually. There are
		// two cases:
		// 1). this is a frozen version file - do not edit this in any case.
		// 2). this is a 'current' file. If you make a backwards compatible change to
		// the interface (from the latest frozen version), the build system will
		// prompt you to update this file with `m <name>-update-api`.
		//
		// You must not make a backward incompatible change to any AIDL file built
		// with the aidl_interface module type with versions property set. The module
		// type is used to build AIDL files in a way that they can be used across
		// independently updatable components of the system. If a device is shipped
		// with such a backward incompatible change, it has a high risk of breaking
		// later when a module using the interface is updated, e.g., Mainline modules.

		package android.hardware.wifi;
		@VintfStability
		parcelable WifiChipCapabilities {
		int maxMloLinkCount;
		int maxConcurrentTdlsSessionCount;
		}

wifi/aidl/android/hardware/wifi/IWifiChip.aidl

+13 −0

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@ import android.hardware.wifi.IWifiStaIface;
		import android.hardware.wifi.IfaceConcurrencyType;
		import android.hardware.wifi.IfaceType;
		import android.hardware.wifi.WifiBand;
		import android.hardware.wifi.WifiChipCapabilities;
		import android.hardware.wifi.WifiDebugHostWakeReasonStats;
		import android.hardware.wifi.WifiDebugRingBufferStatus;
		import android.hardware.wifi.WifiDebugRingBufferVerboseLevel;
		@@ -784,6 +785,18 @@ interface IWifiChip {
		*/
		WifiRadioCombinationMatrix getSupportedRadioCombinationsMatrix();

		/**
		* Get capabilities supported by this chip.
		*
		* @return Chip capabilities represented by \|WifiChipCapabilities\|.
		* @throws ServiceSpecificException with one of the following values:
		* \|WifiStatusCode.ERROR_WIFI_CHIP_INVALID\|,
		* \|WifiStatusCode.ERROR_NOT_SUPPORTED\|,
		* \|WifiStatusCode.FAILURE_UNKNOWN\|
		*
		*/
		WifiChipCapabilities getWifiChipCapabilities();

		/**
		* Retrieve a list of usable Wifi channels for the specified band &
		* operational modes.

wifi/aidl/android/hardware/wifi/WifiChipCapabilities.aidl

0 → 100644

+37 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2022 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;

		/**
		* WifiChipCapabilities captures various Wifi chip capability params.
		*/
		@VintfStability
		parcelable WifiChipCapabilities {
		/**
		* Maximum number of links used in Multi-Link Operation. The maximum
		* number of links used for MLO can be different from the number of
		* radios supported by the chip.
		*
		* This is a static configuration of the chip.
		*/
		int maxMloLinkCount;
		/**
		* Maximum number of concurrent TDLS sessions that can be enabled
		* by framework via ISupplicantStaIface#initiateTdlsSetup().
		*/
		int maxConcurrentTdlsSessionCount;
		}

wifi/aidl/default/aidl_struct_util.cpp

+9 −0

Original line number	Diff line number	Diff line
		@@ -2768,6 +2768,15 @@ bool convertLegacyRadioCombinationsMatrixToAidl(
		return true;
		}

		bool convertLegacyWifiChipCapabilitiesToAidl(
		const legacy_hal::wifi_chip_capabilities& legacy_chip_capabilities,
		WifiChipCapabilities& aidl_chip_capabilities) {
		aidl_chip_capabilities.maxMloLinkCount = legacy_chip_capabilities.max_mlo_link_count;
		aidl_chip_capabilities.maxConcurrentTdlsSessionCount =
		legacy_chip_capabilities.max_concurrent_tdls_session_count;
		return true;
		}

		} // namespace aidl_struct_util
		} // namespace wifi
		} // namespace hardware