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

Commit ea2d2350 authored by Les Lee's avatar Les Lee
Browse files

wifi: Adds a new vendor HAL API for MLO SAP 

1. Creates a new ApIfaceParams for all types of AP iface creation
and deprecated the old APIs.
2. Add usesMlo in ApIface to indicate Iface type for MLO SAP.

PS: Also rename isMlo to usesMlo in hostapd hal.

Bug: 362355566
Test: Build & manuel
Change-Id: I2460d1d00e4884c5ae22f829ec69df458a039175
parent 6a700d33

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

0 → 100644
+40 −0
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/IWifiApIface.aidl

+1 −0
Original line number Diff line number Diff line
@@ -40,4 +40,5 @@ interface IWifiApIface { 
  void setCountryCode(in byte[2] code);

  void resetToFactoryMacAddress();

  void setMacAddress(in byte[6] mac);

  boolean usesMlo();

}

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

+10 −0
Original line number Diff line number Diff line
@@ -35,7 +35,13 @@ package android.hardware.wifi; 
@VintfStability

interface IWifiChip {

  void configureChip(in int modeId);

  /**

   * @deprecated This method is deprecated from AIDL v3, newer HALs should use createApOrBridgedApIfaceWithParams.

   */

  @PropagateAllowBlocking android.hardware.wifi.IWifiApIface createApIface();

  /**

   * @deprecated This method is deprecated from AIDL v3, newer HALs should use createApOrBridgedApIfaceWithParams.

   */

  @PropagateAllowBlocking android.hardware.wifi.IWifiApIface createBridgedApIface();

  @PropagateAllowBlocking android.hardware.wifi.IWifiNanIface createNanIface();

  @PropagateAllowBlocking android.hardware.wifi.IWifiP2pIface createP2pIface();
@@ -83,8 +89,12 @@ interface IWifiChip { 
  void triggerSubsystemRestart();

  void enableStaChannelForPeerNetwork(in int channelCategoryEnableFlag);

  void setMloMode(in android.hardware.wifi.IWifiChip.ChipMloMode mode);

  /**

   * @deprecated This method is deprecated from AIDL v3, newer HALs should use createApOrBridgedApIfaceWithParams.

   */

  @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);

  const int NO_POWER_CAP_CONSTANT = 0x7FFFFFFF;

  @Backing(type="int") @VintfStability

  enum FeatureSetMask {

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

0 → 100644
+40 −0
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/IWifiApIface.aidl

+7 −0
Original line number Diff line number Diff line
@@ -85,4 +85,11 @@ interface IWifiApIface { 
     *         |WifiStatusCode.ERROR_UNKNOWN|

     */

    void setMacAddress(in byte[6] mac);



    /**

     * Check if ApIface is for an AP using Multi-Link Operation

     *

     * @return true if it is MLO iface, false otherwise.

     */

    boolean usesMlo();

}