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

Commit 3c1e51eb authored by Gabriel Biren's avatar Gabriel Biren Committed by Automerger Merge Worker
Browse files

Merge "Add WiFi Vendor HAL AIDL interface definitions." am: 1bdfe392 am:... 

Merge "Add WiFi Vendor HAL AIDL interface definitions." am: 1bdfe392 am: c75dd7f4 am: f657125e am: 35d81982

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



Change-Id: I04dc5c4edf40cc7674519edc9fa58de53ae34158
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 184801b5 35d81982

compatibility_matrices/compatibility_matrix.current.xml

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

        </interface>

    </hal>

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

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

        <version>1</version>

        <interface>

            <name>IWifi</name>

            <instance>default</instance>

        </interface>

    </hal>

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

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

        <version>1.3-6</version>

wifi/aidl/Android.bp

0 → 100644
+44 −0
Original line number Diff line number Diff line 
// Copyright (C) 2022 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 {

    // See: http://go/android-license-faq

    // A large-scale-change added 'default_applicable_licenses' to import

    // all of the 'license_kinds' from "hardware_interfaces_license"

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: ["hardware_interfaces_license"],

}



aidl_interface {

    name: "android.hardware.wifi",

    vendor_available: true,

    srcs: [

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

    ],

    stability: "vintf",

    backend: {

        java: {

            sdk_version: "module_current",

            apex_available: [

                "//apex_available:platform",

                "com.android.wifi",

            ],

            min_sdk_version: "30",

            lint: {

                enabled: false,

            },

        },

    },

}

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

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

 * Copyright (C) 2022 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

interface IWifi {

  @PropagateAllowBlocking android.hardware.wifi.IWifiChip getChip(int chipId);

  int[] getChipIds();

  boolean isStarted();

  void registerEventCallback(in android.hardware.wifi.IWifiEventCallback callback);

  void start();

  void stop();

}

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

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

 * Copyright (C) 2022 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

interface IWifiApIface {

  String getName();

  String[] getBridgedInstances();

  byte[6] getFactoryMacAddress();

  void setCountryCode(in byte[2] code);

  int[] getValidFrequenciesForBand(in android.hardware.wifi.WifiBand band);

  void resetToFactoryMacAddress();

  void setMacAddress(in byte[6] mac);

}

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

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

 * Copyright (C) 2022 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

interface IWifiChip {

  void configureChip(in int modeId);

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

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

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

  @PropagateAllowBlocking android.hardware.wifi.IWifiP2pIface createP2pIface();

  @PropagateAllowBlocking android.hardware.wifi.IWifiRttController createRttController(in android.hardware.wifi.IWifiStaIface boundIface);

  @PropagateAllowBlocking android.hardware.wifi.IWifiStaIface createStaIface();

  void enableDebugErrorAlerts(in boolean enable);

  void flushRingBufferToFile();

  void forceDumpToDebugRingBuffer(in String ringName);

  @PropagateAllowBlocking android.hardware.wifi.IWifiApIface getApIface(in String ifname);

  String[] getApIfaceNames();

  android.hardware.wifi.IWifiChip.ChipMode[] getAvailableModes();

  android.hardware.wifi.IWifiChip.ChipCapabilityMask getCapabilities();

  android.hardware.wifi.WifiDebugHostWakeReasonStats getDebugHostWakeReasonStats();

  android.hardware.wifi.WifiDebugRingBufferStatus[] getDebugRingBuffersStatus();

  int getId();

  int getMode();

  @PropagateAllowBlocking android.hardware.wifi.IWifiNanIface getNanIface(in String ifname);

  String[] getNanIfaceNames();

  @PropagateAllowBlocking android.hardware.wifi.IWifiP2pIface getP2pIface(in String ifname);

  String[] getP2pIfaceNames();

  @PropagateAllowBlocking android.hardware.wifi.IWifiStaIface getStaIface(in String ifname);

  String[] getStaIfaceNames();

  android.hardware.wifi.WifiRadioCombinationMatrix getSupportedRadioCombinationsMatrix();

  android.hardware.wifi.WifiUsableChannel[] getUsableChannels(in android.hardware.wifi.WifiBand band, in android.hardware.wifi.WifiIfaceMode ifaceModeMask, in android.hardware.wifi.IWifiChip.UsableChannelFilter filterMask);

  void registerEventCallback(in android.hardware.wifi.IWifiChipEventCallback callback);

  void removeApIface(in String ifname);

  void removeIfaceInstanceFromBridgedApIface(in String brIfaceName, in String ifaceInstanceName);

  void removeNanIface(in String ifname);

  void removeP2pIface(in String ifname);

  void removeStaIface(in String ifname);

  android.hardware.wifi.IWifiChip.ChipDebugInfo requestChipDebugInfo();

  byte[] requestDriverDebugDump();

  byte[] requestFirmwareDebugDump();

  void resetTxPowerScenario();

  void selectTxPowerScenario(in android.hardware.wifi.IWifiChip.TxPowerScenario scenario);

  void setCoexUnsafeChannels(in android.hardware.wifi.IWifiChip.CoexUnsafeChannel[] unsafeChannels, in android.hardware.wifi.IWifiChip.CoexRestriction restrictions);

  void setCountryCode(in byte[2] code);

  void setLatencyMode(in android.hardware.wifi.IWifiChip.LatencyMode mode);

  void setMultiStaPrimaryConnection(in String ifName);

  void setMultiStaUseCase(in android.hardware.wifi.IWifiChip.MultiStaUseCase useCase);

  void startLoggingToDebugRingBuffer(in String ringName, in android.hardware.wifi.WifiDebugRingBufferVerboseLevel verboseLevel, in int maxIntervalInSec, in int minDataSizeInBytes);

  void stopLoggingToDebugRingBuffer();

  void triggerSubsystemRestart();

  const int NO_POWER_CAP_CONSTANT = 2147483647;

  @Backing(type="int") @VintfStability

  enum ChipCapabilityMask {

    DEBUG_MEMORY_FIRMWARE_DUMP = 1,

    DEBUG_MEMORY_DRIVER_DUMP = 2,

    DEBUG_RING_BUFFER_CONNECT_EVENT = 4,

    DEBUG_RING_BUFFER_POWER_EVENT = 8,

    DEBUG_RING_BUFFER_WAKELOCK_EVENT = 16,

    DEBUG_RING_BUFFER_VENDOR_DATA = 32,

    DEBUG_HOST_WAKE_REASON_STATS = 64,

    DEBUG_ERROR_ALERTS = 128,

    SET_TX_POWER_LIMIT = 256,

    D2D_RTT = 512,

    D2AP_RTT = 1024,

    USE_BODY_HEAD_SAR = 2048,

    SET_LATENCY_MODE = 4096,

    P2P_RAND_MAC = 8192,

    WIGIG = 16384,

  }

  @VintfStability

  parcelable ChipConcurrencyCombinationLimit {

    android.hardware.wifi.IfaceConcurrencyType[] types;

    int maxIfaces;

  }

  @VintfStability

  parcelable ChipConcurrencyCombination {

    android.hardware.wifi.IWifiChip.ChipConcurrencyCombinationLimit[] limits;

  }

  @VintfStability

  parcelable ChipDebugInfo {

    String driverDescription;

    String firmwareDescription;

  }

  @VintfStability

  parcelable ChipIfaceCombinationLimit {

    android.hardware.wifi.IfaceType[] types;

    int maxIfaces;

  }

  @VintfStability

  parcelable ChipIfaceCombination {

    android.hardware.wifi.IWifiChip.ChipIfaceCombinationLimit[] limits;

  }

  @VintfStability

  parcelable ChipMode {

    int id;

    android.hardware.wifi.IWifiChip.ChipConcurrencyCombination[] availableCombinations;

  }

  @Backing(type="int") @VintfStability

  enum CoexRestriction {

    WIFI_DIRECT = 1,

    SOFTAP = 2,

    WIFI_AWARE = 4,

  }

  @VintfStability

  parcelable CoexUnsafeChannel {

    android.hardware.wifi.WifiBand band;

    int channel;

    int powerCapDbm;

  }

  @Backing(type="int") @VintfStability

  enum LatencyMode {

    NORMAL = 0,

    LOW = 1,

  }

  @Backing(type="byte") @VintfStability

  enum MultiStaUseCase {

    DUAL_STA_TRANSIENT_PREFER_PRIMARY = 0,

    DUAL_STA_NON_TRANSIENT_UNBIASED = 1,

  }

  @Backing(type="int") @VintfStability

  enum TxPowerScenario {

    VOICE_CALL = 0,

    ON_HEAD_CELL_OFF = 1,

    ON_HEAD_CELL_ON = 2,

    ON_BODY_CELL_OFF = 3,

    ON_BODY_CELL_ON = 4,

  }

  @Backing(type="int") @VintfStability

  enum UsableChannelFilter {

    CELLULAR_COEXISTENCE = 1,

    CONCURRENCY = 2,

    NAN_INSTANT_MODE = 4,

  }

}