Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 11:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "wifi: Upgrade vendor hal version" into main

Browse Source
This commit is contained in:
Yi Shiou (Les) Lee
2024-09-25 21:36:07 +00:00
committed by Android (Google) Code Review
parent f2650b0542 5ea0e25f1f
commit e0e6f11feb
11 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
compatibility_matrices/compatibility_matrix.202504.xml
View File

@@ -646,7 +646,7 @@
</hal>
<hal format="aidl" updatable-via-apex="true">
<name>android.hardware.wifi</name>
<version>1-2</version>
<version>2-3</version>
<interface>
<name>IWifi</name>
<instance>default</instance>

2
wifi/aidl/Android.bp
View File

@@ -64,5 +64,5 @@ aidl_interface {
},
],
frozen: true,
frozen: false,
}

1
wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/IWifiChip.aidl
View File

@@ -98,6 +98,7 @@ interface IWifiChip {
SET_AFC_CHANNEL_ALLOWANCE = (1 << 7) /* 128 */,
T2LM_NEGOTIATION = (1 << 8) /* 256 */,
SET_VOIP_MODE = (1 << 9) /* 512 */,
MLO_SAP = (1 << 10) /* 1024 */,
}
@VintfStability
parcelable ChipConcurrencyCombinationLimit {

4
wifi/aidl/android/hardware/wifi/IWifiChip.aidl
View File

@@ -87,6 +87,10 @@ interface IWifiChip {
* Chip supports voip mode setting.
*/
SET_VOIP_MODE = 1 << 9,
/**
* Chip supports Wi-Fi 7 MLO SoftAp.
*/
MLO_SAP = 1 << 10,
}
/**

8
wifi/aidl/default/Android.bp
View File

@@ -106,7 +106,7 @@ cc_library_static {
"libwifi-hal",
"libwifi-system-iface",
"libxml2",
"android.hardware.wifi-V2-ndk",
"android.hardware.wifi-V3-ndk",
],
export_include_dirs: ["."],
@@ -138,7 +138,7 @@ cc_binary {
"libwifi-hal",
"libwifi-system-iface",
"libxml2",
"android.hardware.wifi-V2-ndk",
"android.hardware.wifi-V3-ndk",
],
static_libs: ["android.hardware.wifi-service-lib"],
init_rc: ["android.hardware.wifi-service.rc"],
@@ -167,7 +167,7 @@ cc_binary {
"libwifi-hal",
"libwifi-system-iface",
"libxml2",
"android.hardware.wifi-V2-ndk",
"android.hardware.wifi-V3-ndk",
],
static_libs: ["android.hardware.wifi-service-lib"],
init_rc: ["android.hardware.wifi-service-lazy.rc"],
@@ -199,7 +199,7 @@ cc_test {
static_libs: [
"libgmock",
"libgtest",
"android.hardware.wifi-V2-ndk",
"android.hardware.wifi-V3-ndk",
"android.hardware.wifi.common-V1-ndk",
"android.hardware.wifi-service-lib",
],

2
wifi/aidl/default/aidl_struct_util.cpp
View File

@@ -61,6 +61,8 @@ IWifiChip::FeatureSetMask convertLegacyChipFeatureToAidl(uint64_t feature) {
return IWifiChip::FeatureSetMask::SET_AFC_CHANNEL_ALLOWANCE;
case WIFI_FEATURE_SET_VOIP_MODE:
return IWifiChip::FeatureSetMask::SET_VOIP_MODE;
case WIFI_FEATURE_MLO_SAP:
return IWifiChip::FeatureSetMask::MLO_SAP;
};
CHECK(false) << "Unknown legacy feature: " << feature;
return {};

2
wifi/aidl/default/android.hardware.wifi-service.xml
View File

@@ -1,7 +1,7 @@
<manifest version="1.0" type="device">
<hal format="aidl">
<name>android.hardware.wifi</name>
<version>2</version>
<version>3</version>
<fqname>IWifi/default</fqname>
</hal>
</manifest>

12
wifi/aidl/vts/functional/Android.bp
View File

@@ -41,7 +41,7 @@ cc_test {
static_libs: [
"VtsHalWifiTargetTestUtil",
"android.hardware.wifi.common-V1-ndk",
"android.hardware.wifi-V2-ndk",
"android.hardware.wifi-V3-ndk",
"libwifi-system-iface",
],
test_suites: [
@@ -67,7 +67,7 @@ cc_test {
static_libs: [
"VtsHalWifiTargetTestUtil",
"android.hardware.wifi.common-V1-ndk",
"android.hardware.wifi-V2-ndk",
"android.hardware.wifi-V3-ndk",
"libwifi-system-iface",
],
test_suites: [
@@ -93,7 +93,7 @@ cc_test {
static_libs: [
"VtsHalWifiTargetTestUtil",
"android.hardware.wifi.common-V1-ndk",
"android.hardware.wifi-V2-ndk",
"android.hardware.wifi-V3-ndk",
"libwifi-system-iface",
],
test_suites: [
@@ -119,7 +119,7 @@ cc_test {
static_libs: [
"VtsHalWifiTargetTestUtil",
"android.hardware.wifi.common-V1-ndk",
"android.hardware.wifi-V2-ndk",
"android.hardware.wifi-V3-ndk",
"libwifi-system-iface",
],
test_suites: [
@@ -145,7 +145,7 @@ cc_test {
static_libs: [
"VtsHalWifiTargetTestUtil",
"android.hardware.wifi.common-V1-ndk",
"android.hardware.wifi-V2-ndk",
"android.hardware.wifi-V3-ndk",
"libwifi-system-iface",
],
test_suites: [
@@ -170,7 +170,7 @@ cc_library_static {
],
static_libs: [
"android.hardware.wifi.common-V1-ndk",
"android.hardware.wifi-V2-ndk",
"android.hardware.wifi-V3-ndk",
"libwifi-system-iface",
],
}

2
wifi/hostapd/aidl/vts/functional/Android.bp
View File

@@ -38,7 +38,7 @@ cc_test {
"android.hardware.wifi@1.5",
"android.hardware.wifi@1.6",
"android.hardware.wifi.common-V1-ndk",
"android.hardware.wifi-V2-ndk",
"android.hardware.wifi-V3-ndk",
"libwifi-system",
"libwifi-system-iface",
"VtsHalWifiTargetTestUtil",

1
wifi/legacy_headers/include/hardware_legacy/wifi_hal.h
View File

@@ -494,6 +494,7 @@ void wifi_get_error_info(wifi_error err, const char **msg); // return a pointer
#define WIFI_FEATURE_ROAMING_MODE_CONTROL (uint64_t)0x800000000 // Support for configuring roaming mode
#define WIFI_FEATURE_SET_VOIP_MODE (uint64_t)0x1000000000 // Support Voip mode setting
#define WIFI_FEATURE_CACHED_SCAN_RESULTS (uint64_t)0x2000000000 // Support cached scan result report
#define WIFI_FEATURE_MLO_SAP (uint64_t)0x4000000000 // Support MLO SoftAp
// Add more features here
#define IS_MASK_SET(mask, flags) (((flags) & (mask)) == (mask))

6
wifi/supplicant/aidl/vts/functional/Android.bp
View File

@@ -53,7 +53,7 @@ cc_test {
"VtsHalWifiV1_5TargetTestUtil",
"VtsHalWifiSupplicantV1_0TargetTestUtil",
"android.hardware.wifi.common-V1-ndk",
"android.hardware.wifi-V2-ndk",
"android.hardware.wifi-V3-ndk",
"VtsHalWifiTargetTestUtil",
],
test_suites: [
@@ -91,7 +91,7 @@ cc_test {
"VtsHalWifiV1_5TargetTestUtil",
"VtsHalWifiSupplicantV1_0TargetTestUtil",
"android.hardware.wifi.common-V1-ndk",
"android.hardware.wifi-V2-ndk",
"android.hardware.wifi-V3-ndk",
"VtsHalWifiTargetTestUtil",
],
test_suites: [
@@ -129,7 +129,7 @@ cc_test {
"VtsHalWifiV1_5TargetTestUtil",
"VtsHalWifiSupplicantV1_0TargetTestUtil",
"android.hardware.wifi.common-V1-ndk",
"android.hardware.wifi-V2-ndk",
"android.hardware.wifi-V3-ndk",
"VtsHalWifiTargetTestUtil",
],
test_suites: [