Revert "wifi: Get MLO capabilities from chip"

This reverts commit 446ac2c237.

Reason for revert: Broken Build 9360556 on git_master on aosp_bramble-userdebug

Change-Id: Iedae7c2823439b0151e87910b5de8c3e3302c003
This commit is contained in:
Mahesh KKV
2022-12-02 08:41:45 +00:00
committed by Android (Google) Code Review
parent 446ac2c237
commit fb0e9cfe44
4 changed files with 0 additions and 86 deletions

View File

@@ -59,7 +59,6 @@ interface IWifiChip {
@PropagateAllowBlocking android.hardware.wifi.IWifiStaIface getStaIface(in String ifname);
String[] getStaIfaceNames();
android.hardware.wifi.WifiRadioCombinationMatrix getSupportedRadioCombinationsMatrix();
android.hardware.wifi.MloCapabilities getMloCapabilities();
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);

View File

@@ -1,38 +0,0 @@
/*
* 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
parcelable MloCapabilities {
int maxLinkCount;
}

View File

@@ -24,7 +24,6 @@ import android.hardware.wifi.IWifiRttController;
import android.hardware.wifi.IWifiStaIface;
import android.hardware.wifi.IfaceConcurrencyType;
import android.hardware.wifi.IfaceType;
import android.hardware.wifi.MloCapabilities;
import android.hardware.wifi.WifiBand;
import android.hardware.wifi.WifiDebugHostWakeReasonStats;
import android.hardware.wifi.WifiDebugRingBufferStatus;
@@ -785,18 +784,6 @@ interface IWifiChip {
*/
WifiRadioCombinationMatrix getSupportedRadioCombinationsMatrix();
/**
* Get MLO capabilities supported by this chip.
*
* @return MLO capabilities represented by |MloCapabilities|.
* @throws ServiceSpecificException with one of the following values:
* |WifiStatusCode.ERROR_WIFI_CHIP_INVALID|,
* |WifiStatusCode.ERROR_NOT_SUPPORTED|,
* |WifiStatusCode.FAILURE_UNKNOWN|
*
*/
MloCapabilities getMloCapabilities();
/**
* Retrieve a list of usable Wifi channels for the specified band &
* operational modes.

View File

@@ -1,34 +0,0 @@
/*
* 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 android.hardware.wifi;
/**
* With MLO, Multi-Link Devices (MLD) can simultaneously use multiple bands
* under different circumstances(e.g. load balancing, data aggregation ..etc.).
* MloCapabilities captures chip capabilities for Multi-link operation.
*/
@VintfStability
parcelable MloCapabilities {
/**
* Maximum number of links used in Multi-Link Operation. The maximum
* number of links used for MLO can be different from the number of
* radios supported by the chip.
*
* This is a static configuration of the chip.
*/
int maxLinkCount;
}