Merge "Add list of OuiKeyedData to the Hostapd AIDL IfaceParams type." into main (d947966a) · Commits · e / os / android_hardware_interfaces

compatibility_matrices/compatibility_matrix.9.xml

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -680,7 +680,7 @@
	</hal>		</hal>
	<hal format="aidl" optional="true">		<hal format="aidl" optional="true">
	<name>android.hardware.wifi.hostapd</name>		<name>android.hardware.wifi.hostapd</name>
	<version>1</version>		<version>1-2</version>
	<interface>		<interface>
	<name>IHostapd</name>		<name>IHostapd</name>
	<instance>default</instance>		<instance>default</instance>

+6 −1

Original line number	Original line	Diff line number	Diff line
	@@ -27,6 +27,9 @@ aidl_interface {
	srcs: [		srcs: [
	"android/hardware/wifi/hostapd/*.aidl",		"android/hardware/wifi/hostapd/*.aidl",
	],		],
			imports: [
			"android.hardware.wifi.common-V1",
			],
	stability: "vintf",		stability: "vintf",
	backend: {		backend: {
	java: {		java: {
	@@ -40,6 +43,9 @@ aidl_interface {
	ndk: {		ndk: {
	gen_trace: true,		gen_trace: true,
	},		},
			cpp: {
			enabled: false,
			},
	},		},
	versions_with_info: [		versions_with_info: [
	{		{
	@@ -47,5 +53,4 @@ aidl_interface {
	imports: [],		imports: [],
	},		},
	],		],

	}		}

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -37,4 +37,5 @@ parcelable IfaceParams {
	String name;		String name;
	android.hardware.wifi.hostapd.HwModeParams hwModeParams;		android.hardware.wifi.hostapd.HwModeParams hwModeParams;
	android.hardware.wifi.hostapd.ChannelParams[] channelParams;		android.hardware.wifi.hostapd.ChannelParams[] channelParams;
			@nullable android.hardware.wifi.common.OuiKeyedData[] vendorData;
	}		}

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -16,6 +16,7 @@

	package android.hardware.wifi.hostapd;		package android.hardware.wifi.hostapd;

			import android.hardware.wifi.common.OuiKeyedData;
	import android.hardware.wifi.hostapd.ChannelParams;		import android.hardware.wifi.hostapd.ChannelParams;
	import android.hardware.wifi.hostapd.HwModeParams;		import android.hardware.wifi.hostapd.HwModeParams;

	@@ -36,4 +37,8 @@ parcelable IfaceParams {
	* The list of the channel params for the dual interfaces.		* The list of the channel params for the dual interfaces.
	*/		*/
	ChannelParams[] channelParams;		ChannelParams[] channelParams;
			/**
			* Optional vendor-specific configuration parameters.
			*/
			@nullable OuiKeyedData[] vendorData;
	}		}