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

Commit a0fc8273 authored by Kai Shi's avatar Kai Shi Committed by Android (Google) Code Review
Browse files

Merge "Add the HAL support for getCachedScanResult." into main

parents 30f558a8 7d0e5e92
Loading
Loading
Loading
Loading
+39 −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 CachedScanData {
  int[] scannedFrequenciesMhz;
  android.hardware.wifi.CachedScanResult[] cachedScanResults;
}
+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.
 */
///////////////////////////////////////////////////////////////////////////////
// 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 CachedScanResult {
  long timeStampInUs;
  byte[] ssid;
  byte[6] bssid;
  int rssiDbm;
  int frequencyMhz;
  android.hardware.wifi.WifiChannelWidthInMhz channelWidthMhz;
  android.hardware.wifi.WifiRatePreamble preambleType;
}
+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ interface IWifiStaIface {
  void stopRssiMonitoring(in int cmdId);
  void stopSendingKeepAlivePackets(in int cmdId);
  void setDtimMultiplier(in int multiplier);
  android.hardware.wifi.CachedScanData getCachedScanData();
  @Backing(type="int") @VintfStability
  enum FeatureSetMask {
    APF = (1 << 0) /* 1 */,
+35 −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.CachedScanResult;

/**
 * Scan data cached in Wifi firmware
 */
@VintfStability
parcelable CachedScanData {
    /**
     * List of scanned frequencies in MHz.
     */
    int[] scannedFrequenciesMhz;

    /**
     * List of scan results.
     */
    CachedScanResult[] cachedScanResults;
}
+55 −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.WifiChannelWidthInMhz;
import android.hardware.wifi.WifiRatePreamble;

/**
 * Scan result cached in Wifi firmware
 */
@VintfStability
parcelable CachedScanResult {
    /**
     * Time in micro seconds since boot when the scan was done
     */
    long timeStampInUs;
    /**
     * SSID of beacon excluding null.
     */
    byte[] ssid;
    /**
     * BSSID of beacon
     */
    byte[6] bssid;
    /**
     * Beacon received signal stength indicatior (RSSI), in dbm
     */
    int rssiDbm;
    /**
     * Frequency of beacon, in MHz
     */
    int frequencyMhz;
    /**
     * Channel bandwidth of found network
     */
    WifiChannelWidthInMhz channelWidthMhz;
    /**
     * Supported rate and preamble type
     */
    WifiRatePreamble preambleType;
}
Loading