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

Commit 279105a6 authored by Linzhao Ye's avatar Linzhao Ye Committed by Automerger Merge Worker
Browse files

Merge "Add Wifi HAL hostapd AIDL interface definitions." am: 7218fea0 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1811377

Change-Id: Ib9671d914729a0494d3483e46a47fa79da1fd83e
parents 0ccb375b 7218fea0

compatibility_matrices/compatibility_matrix.current.xml

+8 −0
Original line number Diff line number Diff line
@@ -640,6 +640,14 @@ 
            <instance>default</instance>

        </interface>

    </hal>

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

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

        <version>1</version>

        <interface>

            <name>IHostapd</name>

            <instance>default</instance>

        </interface>

    </hal>

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

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

        <version>1.2-4</version>

wifi/hostapd/aidl/Android.bp

0 → 100644
+37 −0
Original line number Diff line number Diff line 
// Copyright (C) 2021 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.



aidl_interface {

    name: "android.hardware.wifi.hostapd",

    vendor_available: true,

    srcs: [

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

    ],

    stability: "vintf",

    backend: {

        java: {

            sdk_version: "module_current",

            apex_available: [

                "//apex_available:platform",

                "com.android.wifi",

            ],

            min_sdk_version: "30",

        },

        ndk: {

            vndk: {

                enabled: true,

            },

        },

    },

}

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

0 → 100644
+43 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2021 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.hostapd;

@VintfStability

parcelable ApInfo {

  String ifaceName;

  String apIfaceInstance;

  int freqMhz;

  android.hardware.wifi.hostapd.Bandwidth bandwidth;

  android.hardware.wifi.hostapd.Generation generation;

  byte[] apIfaceInstanceMacAddress;

}

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

0 → 100644
+41 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2021 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.hostapd;

@Backing(type="int") @VintfStability

enum BandMask {

  BAND_2_GHZ = 1,

  BAND_5_GHZ = 2,

  BAND_6_GHZ = 4,

  BAND_60_GHZ = 8,

}

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

0 → 100644
+48 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2021 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.hostapd;

@Backing(type="int") @VintfStability

enum Bandwidth {

  BANDWIDTH_INVALID = 0,

  BANDWIDTH_20_NOHT = 1,

  BANDWIDTH_20 = 2,

  BANDWIDTH_40 = 3,

  BANDWIDTH_80 = 4,

  BANDWIDTH_80P80 = 5,

  BANDWIDTH_160 = 6,

  BANDWIDTH_2160 = 7,

  BANDWIDTH_4320 = 8,

  BANDWIDTH_6480 = 9,

  BANDWIDTH_8640 = 10,

}