Merge "Move ApIfaceParams directly into the IWifiChip interface." into main (7b650c83) · Commits · e / os / android_hardware_interfaces

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

deleted100644 → 0

+0 −40

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2024 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 ApIfaceParams {
		android.hardware.wifi.IfaceConcurrencyType ifaceType;
		boolean usesMlo;
		@nullable android.hardware.wifi.common.OuiKeyedData[] vendorData;
		}

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

+7 −1

Original line number	Diff line number	Diff line
		@@ -94,7 +94,7 @@ interface IWifiChip {
		*/
		@PropagateAllowBlocking android.hardware.wifi.IWifiApIface createApOrBridgedApIface(in android.hardware.wifi.IfaceConcurrencyType iface, in android.hardware.wifi.common.OuiKeyedData[] vendorData);
		void setVoipMode(in android.hardware.wifi.IWifiChip.VoipMode mode);
		@PropagateAllowBlocking android.hardware.wifi.IWifiApIface createApOrBridgedApIfaceWithParams(in android.hardware.wifi.ApIfaceParams params);
		@PropagateAllowBlocking android.hardware.wifi.IWifiApIface createApOrBridgedApIfaceWithParams(in android.hardware.wifi.IWifiChip.ApIfaceParams params);
		const int NO_POWER_CAP_CONSTANT = 0x7FFFFFFF;
		@Backing(type="int") @VintfStability
		enum FeatureSetMask {
		@@ -191,4 +191,10 @@ interface IWifiChip {
		HIGH_THROUGHPUT = 2,
		LOW_POWER = 3,
		}
		@VintfStability
		parcelable ApIfaceParams {
		android.hardware.wifi.IfaceConcurrencyType ifaceType;
		boolean usesMlo;
		@nullable android.hardware.wifi.common.OuiKeyedData[] vendorData;
		}
		}

wifi/aidl/android/hardware/wifi/ApIfaceParams.aidl

deleted100644 → 0

+0 −40

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

		import android.hardware.wifi.IfaceConcurrencyType;
		import android.hardware.wifi.common.OuiKeyedData;

		/**
		* Parameters to use for setting up the access point interfaces.
		*/
		@VintfStability
		parcelable ApIfaceParams {
		/**
		* IfaceConcurrencyType to be created. Takes one of
		* \|IfaceConcurrencyType.AP\| or \|IfaceConcurrencyType.AP_BRIDGED\|
		*/
		IfaceConcurrencyType ifaceType;
		/**
		* Whether the current iface will be operated on Multi-links on the one MLD device (MLO).
		*/
		boolean usesMlo;
		/**
		* Optional vendor-specific configuration parameters.
		*/
		@nullable OuiKeyedData[] vendorData;
		}

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

+20 −1

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@
		package android.hardware.wifi;

		import android.hardware.wifi.AfcChannelAllowance;
		import android.hardware.wifi.ApIfaceParams;
		import android.hardware.wifi.IWifiApIface;
		import android.hardware.wifi.IWifiChipEventCallback;
		import android.hardware.wifi.IWifiNanIface;
		@@ -1221,6 +1220,26 @@ interface IWifiChip {
		*/
		void setVoipMode(in VoipMode mode);

		/**
		* Parameters for setting up access point (AP) interfaces.
		*/
		@VintfStability
		parcelable ApIfaceParams {
		/**
		* IfaceConcurrencyType to be created. Takes one of
		* \|IfaceConcurrencyType.AP\| or \|IfaceConcurrencyType.AP_BRIDGED\|
		*/
		IfaceConcurrencyType ifaceType;
		/**
		* Whether the current iface will be operated on Multi-links on the one MLD device (MLO).
		*/
		boolean usesMlo;
		/**
		* Optional vendor-specific configuration parameters.
		*/
		@nullable OuiKeyedData[] vendorData;
		}

		/**
		* Create an AP or bridged AP iface on the chip based on ApIfaceParamss.
		*