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

Commit e07c6978 authored by Oscar Shu's avatar Oscar Shu Committed by Android (Google) Code Review
Browse files

Merge "Update setAfcChannelAllowance" into udc-dev

parents 083ec7f5 4275c879
Loading
Loading
Loading
Loading
+40 −0
Original line number Diff line number Diff line
/*
 * Copyright (C) 2023 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 AfcChannelAllowance {
  android.hardware.wifi.AvailableAfcFrequencyInfo[] availableAfcFrequencyInfos;
  android.hardware.wifi.AvailableAfcChannelInfo[] availableAfcChannelInfos;
  long availabilityExpireTimeMs;
}
+40 −0
Original line number Diff line number Diff line
/*
 * Copyright (C) 2023 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 AvailableAfcChannelInfo {
  int globalOperatingClass;
  int channelCfi;
  int maxEirpDbm;
}
+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ interface IWifiChip {
  android.hardware.wifi.WifiRadioCombination[] getSupportedRadioCombinations();
  android.hardware.wifi.WifiChipCapabilities getWifiChipCapabilities();
  android.hardware.wifi.WifiUsableChannel[] getUsableChannels(in android.hardware.wifi.WifiBand band, in int ifaceModeMask, in int filterMask);
  void setAfcChannelAllowance(in android.hardware.wifi.AvailableAfcFrequencyInfo[] availableAfcFrequencyInfo);
  void setAfcChannelAllowance(in android.hardware.wifi.AfcChannelAllowance afcChannelAllowance);
  void registerEventCallback(in android.hardware.wifi.IWifiChipEventCallback callback);
  void removeApIface(in String ifname);
  void removeIfaceInstanceFromBridgedApIface(in String brIfaceName, in String ifaceInstanceName);
+52 −0
Original line number Diff line number Diff line
/*
 * Copyright (C) 2023 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.AvailableAfcChannelInfo;
import android.hardware.wifi.AvailableAfcFrequencyInfo;

/**
 * Defines the maximum permissible power spectral density to support 6Ghz with standard power for
 * AFC. The maximum power can be either defined based on frequencies or channel number.
 *
 * Note, based on AFC server support, either availableAfcFrequencyInfos or availableAfcChannelInfos
 * may be empty. If one of them is empty while the other is not, use the non-empty one and ignore
 * the empty one. If both are empty then it means 6Ghz standard power should not be supported at
 * all.
 *
 * If availableAfcFrequencyInfos is non-empty, set the max permissible power according to the maxPsd
 * per frequency range, and disallow emmision on 6Ghz frequencies not included in the structure.
 *
 * If availableAfcChannelInfos is non-empty, set the max permissible power according to the
 * maxEirpDbm per channel, and disallow emmision on 6Ghz channels not included in the structure.
 */
@VintfStability
parcelable AfcChannelAllowance {
    /**
     * AFC max permissible information queried from AFC server based on frequency.
     */
    AvailableAfcFrequencyInfo[] availableAfcFrequencyInfos;
    /**
     * AFC max permissible information queried from AFC server on channel number.
     */
    AvailableAfcChannelInfo[] availableAfcChannelInfos;
    /**
     * The time in UTC at which this information expires, as the difference, measured in
     * milliseconds between the expiration time and midnight, January 1, 1970 UTC.
     */
    long availabilityExpireTimeMs;
}
+44 −0
Original line number Diff line number Diff line
/*
 * Copyright (C) 2023 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;

/**
 * Defines the maximum EIRP per channel for supporting 6Ghz standard power for AFC. The format of
 * the data structure is derived from the Wi-Fi Alliance AFC System to AFC Device Interface
 * Specification: AvailableChannelInfo object.
 */
@VintfStability
parcelable AvailableAfcChannelInfo {
    /**
     * The global operating class used to define the channel center frequency indices
     * and operating bandwidth.
     */
    int globalOperatingClass;

    /**
     * The channel center frequency index.
     */
    int channelCfi;

    /**
     * The maximum permissible EIRP in units of dBm available for the channel
     * specified by channelCfi. In addition, in any portion of the channel, the conducted PSD plus
     * the maximum antenna gain cannot exceed the maxEirp divided by the channel width defined by
     * the globalOperatingClass.
     */
    int maxEirpDbm;
}
Loading