Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 66bab48e authored by Gabriel Biren's avatar Gabriel Biren
Browse files

Add list of OuiKeyedData to the Hostapd 

AIDL IfaceParams type.

Requires update to the latest compatibility
matrix to upgrade the Hostapd HAL to V2.

Bug: 296069900
Test: m
Change-Id: I125937857fbc5fee0815369532e502da4c454a53
parent 687c344f

compatibility_matrices/compatibility_matrix.9.xml

+1 −1
Original line number Diff line number Diff line
@@ -664,7 +664,7 @@ 
    </hal>

    <hal format="aidl" optional="true">

        <name>android.hardware.wifi.hostapd</name>

        <version>1</version>

        <version>1-2</version>

        <interface>

            <name>IHostapd</name>

            <instance>default</instance>

wifi/hostapd/aidl/Android.bp

+6 −1
Original line number Diff line number Diff line
@@ -27,6 +27,9 @@ aidl_interface { 
    srcs: [

        "android/hardware/wifi/hostapd/*.aidl",

    ],

    imports: [

        "android.hardware.wifi.common-V1",

    ],

    stability: "vintf",

    backend: {

        java: {
@@ -40,6 +43,9 @@ aidl_interface { 
        ndk: {

            gen_trace: true,

        },

        cpp: {

            enabled: false,

        },

    },

    versions_with_info: [

        {
@@ -47,5 +53,4 @@ aidl_interface { 
            imports: [],

        },

    ],



}

wifi/hostapd/aidl/aidl_api/android.hardware.wifi.hostapd/current/android/hardware/wifi/hostapd/IfaceParams.aidl

+1 −0
Original line number Diff line number Diff line
@@ -37,4 +37,5 @@ parcelable IfaceParams { 
  String name;

  android.hardware.wifi.hostapd.HwModeParams hwModeParams;

  android.hardware.wifi.hostapd.ChannelParams[] channelParams;

  @nullable android.hardware.wifi.common.OuiKeyedData[] vendorData;

}

wifi/hostapd/aidl/android/hardware/wifi/hostapd/IfaceParams.aidl

+5 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package android.hardware.wifi.hostapd;



import android.hardware.wifi.common.OuiKeyedData;

import android.hardware.wifi.hostapd.ChannelParams;

import android.hardware.wifi.hostapd.HwModeParams;
@@ -36,4 +37,8 @@ parcelable IfaceParams { 
     * The list of the channel params for the dual interfaces.

     */

    ChannelParams[] channelParams;

    /**

     * Optional vendor-specific configuration parameters.

     */

    @nullable OuiKeyedData[] vendorData;

}