From abb3a670876b26ff7e6dbb41ec979146f0aa7a11 Mon Sep 17 00:00:00 2001 From: chen yi wen <15068825070@163.com> Date: Tue, 19 Aug 2025 01:43:43 +0000 Subject: [PATCH 01/19] 1 Signed-off-by: chen yi wen <15068825070@163.com> --- .../wifi_manage/wifi_controller/wifi_controller_define.h | 2 +- .../wifi_framework/wifi_manage/wifi_native/BUILD.gn | 4 ++++ .../wifi_native/wifi_hal_interface/i_wifi_struct.h | 1 - .../wifi_framework/wifi_toolkit/config/wifi_config_center.h | 1 - wifi/utils/inc/magic_enum.h | 3 +-- wifi/utils/src/wifi_common_util.cpp | 1 - 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_controller/wifi_controller_define.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_controller/wifi_controller_define.h index 4169b75b0..15083f0f9 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_controller/wifi_controller_define.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_controller/wifi_controller_define.h @@ -24,7 +24,7 @@ namespace Wifi { #define WIFI_OPEN_RETRY_MAX_COUNT 3 #define WIFI_OPEN_RETRY_TIMEOUT 1000 #define WIFI_OPEN_TIMEOUT 10000 -#define CONCRETE_STOP_TIMEOUT 1000 +#define CONCRETE_STOP_TIMEOUT 10000 #define CMD_WIFI_TOGGLED 0x1 #define CMD_SOFTAP_TOGGLED 0x2 diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_native/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_native/BUILD.gn index 739b78f7c..e7688a72f 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_native/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_native/BUILD.gn @@ -180,6 +180,10 @@ if (defined(ohos_lite)) { "AP_INSTANCE_MAX_NUM=$wifi_feature_with_ap_num", ] + if (wifi_feature_non_seperate_p2p) { + defines += [ "NON_SEPERATE_P2P" ] + } + configs = [ ":wifi_fw_common_header" ] deps = [ diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_native/wifi_hal_interface/i_wifi_struct.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_native/wifi_hal_interface/i_wifi_struct.h index 206d9d299..739171aaa 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_native/wifi_hal_interface/i_wifi_struct.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_native/wifi_hal_interface/i_wifi_struct.h @@ -17,7 +17,6 @@ #include #include - #ifdef __cplusplus extern "C" { #endif diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_center.h b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_center.h index a6ad7035e..35c78c73a 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_center.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_center.h @@ -29,7 +29,6 @@ #define STA_INSTANCE_MAX_NUM 2 #endif #define SOFT_BUS_SERVICE_UID 1024 -#define WAUDIO_SERVICE_UID 7056 #define CAST_ENGINE_SERVICE_UID 5526 #define MIRACAST_SERVICE_UID 5529 #define MIRACAST_SERVICE_SA_ID 5527 diff --git a/wifi/utils/inc/magic_enum.h b/wifi/utils/inc/magic_enum.h index f2ce9e0db..31d087300 100644 --- a/wifi/utils/inc/magic_enum.h +++ b/wifi/utils/inc/magic_enum.h @@ -74,8 +74,7 @@ template constexpr size_t GetEnumSize(std::integer_sequence) { constexpr std::array valid{IsValid(Is)>()...}; - constexpr std::size_t count = [](decltype((valid)) validValue) constexpr noexcept->std::size_t - { + constexpr std::size_t count = [](decltype((valid)) validValue) constexpr noexcept->std::size_t { auto nSize = std::size_t{0}; for (std::size_t index = 0; index < validValue.size(); ++index) { if (validValue[index]) { diff --git a/wifi/utils/src/wifi_common_util.cpp b/wifi/utils/src/wifi_common_util.cpp index e3d2de86d..c8b263718 100644 --- a/wifi/utils/src/wifi_common_util.cpp +++ b/wifi/utils/src/wifi_common_util.cpp @@ -26,7 +26,6 @@ #include #include #include -#include "app_mgr_client.h" #include "bundle_mgr_interface.h" #include "if_system_ability_manager.h" #include "ipc_skeleton.h" -- Gitee From 3330cacf2422a4ed9bac009aaecb27c56f87928f Mon Sep 17 00:00:00 2001 From: chen yi wen <15068825070@163.com> Date: Tue, 19 Aug 2025 01:44:07 +0000 Subject: [PATCH 02/19] 1 Signed-off-by: chen yi wen <15068825070@163.com> --- .../wifi_native/client/hdi_client/hdi_interface/wifi_hdi_util.c | 1 + .../wifi_native/client/hdi_client/wifi_hdi_wpa_client.h | 2 +- .../wifi_framework/wifi_manage/wifi_sta_sa/wifi_device_stub.h | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_native/client/hdi_client/hdi_interface/wifi_hdi_util.c b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_native/client/hdi_client/hdi_interface/wifi_hdi_util.c index 1abc093bd..7bd770192 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_native/client/hdi_client/hdi_interface/wifi_hdi_util.c +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_native/client/hdi_client/hdi_interface/wifi_hdi_util.c @@ -16,6 +16,7 @@ #include "securec.h" #include "wifi_hdi_util.h" #include "wifi_common_def.h" +#include #ifndef UT_TEST #include "wifi_log.h" diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_native/client/hdi_client/wifi_hdi_wpa_client.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_native/client/hdi_client/wifi_hdi_wpa_client.h index c8147a2e4..9e80991f2 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_native/client/hdi_client/wifi_hdi_wpa_client.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_native/client/hdi_client/wifi_hdi_wpa_client.h @@ -826,7 +826,7 @@ public: * @return WifiErrorNo */ WifiErrorNo DeliverP2pData(int32_t cmdType, int32_t dataType, const std::string& carryData) const; - + /** * @Description Enable Softap. * diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta_sa/wifi_device_stub.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta_sa/wifi_device_stub.h index 475e4cbc5..a2d9c7f34 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta_sa/wifi_device_stub.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta_sa/wifi_device_stub.h @@ -68,8 +68,8 @@ private: void OnIsMeteredHotspot(uint32_t code, MessageParcel &data, MessageParcel &reply); void OnGetWifiState(uint32_t code, MessageParcel &data, MessageParcel &reply); void OnGetLinkedInfo(uint32_t code, MessageParcel &data, MessageParcel &reply); - void OnGetSignalPollInfoArray(uint32_t code, MessageParcel &data, MessageParcel &reply); void OnGetMultiLinkedInfo(uint32_t code, MessageParcel &data, MessageParcel &reply); + void OnGetSignalPollInfoArray(uint32_t code, MessageParcel &data, MessageParcel &reply); void OnGetIpInfo(uint32_t code, MessageParcel &data, MessageParcel &reply); void OnGetIpV6Info(uint32_t code, MessageParcel &data, MessageParcel &reply); void OnSetCountryCode(uint32_t code, MessageParcel &data, MessageParcel &reply); -- Gitee From 0359a8c07db2de485e22c1000361f95b23e5e8d8 Mon Sep 17 00:00:00 2001 From: chen yi wen <15068825070@163.com> Date: Tue, 19 Aug 2025 01:44:15 +0000 Subject: [PATCH 03/19] 1 Signed-off-by: chen yi wen <15068825070@163.com> --- .../wifi_controller/wifi_controller_state_machine.cpp | 3 +-- .../wifi_manage/wifi_sta_sa/wifi_device_mgr_service_impl.cpp | 1 + .../wifi_manage/wifi_sta_sa/wifi_device_service_impl.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_controller/wifi_controller_state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_controller/wifi_controller_state_machine.cpp index 971675706..35997f5db 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_controller/wifi_controller_state_machine.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_controller/wifi_controller_state_machine.cpp @@ -200,14 +200,13 @@ bool WifiControllerMachine::EnableState::ExecuteStateMsg(InternalMessagePtr msg) msg->GetParam1() == INSTID_WLAN0 ? HandleStaStartFailure(INSTID_WLAN0) : pWifiControllerMachine->multiStaManagers.RemoveManager(INSTID_WLAN1); break; - case CMD_CONCRETE_STOPPED: { + case CMD_CONCRETE_STOPPED: if (!pWifiControllerMachine->concreteManagers.IdExist(INSTID_WLAN0)) { WIFI_LOGI("HandleStopConcretRetry concreteManagers not IdExist"); break; } pWifiControllerMachine->HandleConcreteStop(INSTID_WLAN0); break; - } case CMD_MULTI_STA_STOPPED: pWifiControllerMachine->multiStaManagers.RemoveManager(INSTID_WLAN1); break; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta_sa/wifi_device_mgr_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta_sa/wifi_device_mgr_service_impl.cpp index e6506a115..4f6c8b9f2 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta_sa/wifi_device_mgr_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta_sa/wifi_device_mgr_service_impl.cpp @@ -78,6 +78,7 @@ void WifiDeviceMgrServiceImpl::OnStart() void WifiDeviceMgrServiceImpl::OnStop() { + std::lock_guard lock(g_initMutex); mState = ServiceRunningState::STATE_NOT_START; mPublishFlag = false; WIFI_LOGI("Stop sta service!"); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta_sa/wifi_device_service_impl.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta_sa/wifi_device_service_impl.h index 13a23ef9a..065e073e9 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta_sa/wifi_device_service_impl.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta_sa/wifi_device_service_impl.h @@ -109,10 +109,10 @@ public: ErrCode GetLinkedInfo(WifiLinkedInfo &info) override; - ErrCode GetSignalPollInfoArray(std::vector &wifiSignalPollInfos, int length) override; - ErrCode GetMultiLinkedInfo(std::vector &mloLinkInfo) override; + ErrCode GetSignalPollInfoArray(std::vector &wifiSignalPollInfos, int length) override; + ErrCode GetDisconnectedReason(DisconnectedReason &reason) override; ErrCode GetIpInfo(IpInfo &info) override; -- Gitee From c4510e0aa3df5698124b9d7662cb2d84e867184d Mon Sep 17 00:00:00 2001 From: chen yi wen <15068825070@163.com> Date: Tue, 19 Aug 2025 01:44:31 +0000 Subject: [PATCH 04/19] 1 Signed-off-by: chen yi wen <15068825070@163.com> --- .../wifi_manage/wifi_sta_sa/wifi_device_stub.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta_sa/wifi_device_stub.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta_sa/wifi_device_stub.cpp index ad148cb11..3d944fb43 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta_sa/wifi_device_stub.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta_sa/wifi_device_stub.cpp @@ -131,10 +131,10 @@ void WifiDeviceStub::InitHandleMapEx2() MessageParcel &data, MessageParcel &reply) { OnSetDpiMarkRule(code, data, reply); }; handleFuncMap[static_cast(DevInterfaceCode::WIFI_SVR_CMD_IS_FEATURE_SUPPORTED)] = [this](uint32_t code, MessageParcel &data, MessageParcel &reply) { OnIsFeatureSupported(code, data, reply); }; - handleFuncMap[static_cast(DevInterfaceCode::WIFI_SVR_CMD_GET_NET_CONTROL_INFO)] = [this](uint32_t code, - MessageParcel &data, MessageParcel &reply) { OnReceiveNetworkControlInfo(code, data, reply); }; handleFuncMap[static_cast(DevInterfaceCode::WIFI_SVR_CMD_NETWORK_LAG_INFO)] = [this](uint32_t code, MessageParcel &data, MessageParcel &reply) { OnUpdateNetworkLagInfo(code, data, reply); }; + handleFuncMap[static_cast(DevInterfaceCode::WIFI_SVR_CMD_GET_NET_CONTROL_INFO)] = [this](uint32_t code, + MessageParcel &data, MessageParcel &reply) { OnReceiveNetworkControlInfo(code, data, reply); }; handleFuncMap[static_cast(DevInterfaceCode::WIFI_SVR_CMD_FETCH_SIGNALINFO_VOWIFI)] = [this](uint32_t code, MessageParcel &data, MessageParcel &reply) { OnFetchWifiSignalInfoForVoWiFi(code, data, reply); }; handleFuncMap[static_cast(DevInterfaceCode::WIFI_SVR_CMD_IS_SUPPORT_VOWIFI_DETECT)] = [this] @@ -147,10 +147,10 @@ void WifiDeviceStub::InitHandleMapEx2() (uint32_t code, MessageParcel &data, MessageParcel &reply) { OnSetVoWifiDetectPeriod(code, data, reply); }; handleFuncMap[static_cast(DevInterfaceCode::WIFI_SVR_CMD_GET_VOWIFI_DETECT_PERIOD)] = [this] (uint32_t code, MessageParcel &data, MessageParcel &reply) { OnGetVoWifiDetectPeriod(code, data, reply); }; - handleFuncMap[static_cast(DevInterfaceCode::WIFI_SVR_CMD_GET_SIGNALPOLL_INFO_ARRAY)] = [this] - (uint32_t code, MessageParcel &data, MessageParcel &reply) { OnGetSignalPollInfoArray(code, data, reply); }; handleFuncMap[static_cast(DevInterfaceCode::WIFI_SVR_CMD_GET_MULTI_LINKED_INFO)] = [this] (uint32_t code, MessageParcel &data, MessageParcel &reply) { OnGetMultiLinkedInfo(code, data, reply); }; + handleFuncMap[static_cast(DevInterfaceCode::WIFI_SVR_CMD_GET_SIGNALPOLL_INFO_ARRAY)] = [this] + (uint32_t code, MessageParcel &data, MessageParcel &reply) { OnGetSignalPollInfoArray(code, data, reply); }; } void WifiDeviceStub::InitHandleMap() @@ -653,7 +653,7 @@ void WifiDeviceStub::SendDeviceConfig(int contentSize, std::vector Date: Tue, 19 Aug 2025 01:44:35 +0000 Subject: [PATCH 05/19] 1 Signed-off-by: chen yi wen <15068825070@163.com> --- .../wifi_manage/wifi_sub_manage/wifi_msdp_state_listener.cpp | 2 +- wifi/utils/src/wifi_hisysevent.cpp | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sub_manage/wifi_msdp_state_listener.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sub_manage/wifi_msdp_state_listener.cpp index c10149183..992abe52e 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sub_manage/wifi_msdp_state_listener.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sub_manage/wifi_msdp_state_listener.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023 Huawei Device Co., Ltd. + * Copyright (c) Huawei Technologies Co., Ltd. 2023. All rights reserved. * 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 diff --git a/wifi/utils/src/wifi_hisysevent.cpp b/wifi/utils/src/wifi_hisysevent.cpp index 36707621c..bb7b1d88a 100644 --- a/wifi/utils/src/wifi_hisysevent.cpp +++ b/wifi/utils/src/wifi_hisysevent.cpp @@ -524,6 +524,7 @@ void WriteIsInternetHiSysEvent(int isInternet) void WriteSoftApConnectFailHiSysEvent(int errorCnt) { + WIFI_LOGE("WriteSoftApConnectFailHiSysEvent errorCnt=%{public}d", errorCnt); cJSON *root = cJSON_CreateObject(); if (root == nullptr) { WIFI_LOGE("Failed to create cJSON object"); @@ -543,6 +544,7 @@ void WriteSoftApConnectFailHiSysEvent(int errorCnt) void WriteSoftApClientAccessNetErrorHiSysEvent(int errorCode) { + WIFI_LOGE("WriteSoftApClientAccessNetErrorHiSysEvent errorCode=%{public}d", errorCode); cJSON *root = cJSON_CreateObject(); if (root == nullptr) { WIFI_LOGE("Failed to create cJSON object"); -- Gitee From ac5548cfbdc0543cf1c7348db68e874b53b9db57 Mon Sep 17 00:00:00 2001 From: chen yi wen <15068825070@163.com> Date: Tue, 19 Aug 2025 01:44:39 +0000 Subject: [PATCH 06/19] 1 Signed-off-by: chen yi wen <15068825070@163.com> --- .../wifi_manage/wifi_sub_manage/wifi_msdp_state_listener.h | 2 +- .../wifi_framework/wifi_toolkit/utils/wifi_randommac_helper.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sub_manage/wifi_msdp_state_listener.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sub_manage/wifi_msdp_state_listener.h index 2b27b2b18..29891afa2 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sub_manage/wifi_msdp_state_listener.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sub_manage/wifi_msdp_state_listener.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023 Huawei Device Co., Ltd. + * Copyright (c) Huawei Technologies Co., Ltd. 2023. All rights reserved. * 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 diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_randommac_helper.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_randommac_helper.cpp index fb2b5fb93..1c746d5e6 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_randommac_helper.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/utils/wifi_randommac_helper.cpp @@ -30,6 +30,7 @@ const unsigned long long MAC_ADDRESSS_AIASSIGNED_MASK = 1ULL << 43; const unsigned long long MAC_ADDRESS_ELIASSIGNED_MASK = 1ULL << 42; const unsigned long long MAC_ADDRESS_LOCALLY_ASSIGNED_MASK = 1ULL << 41; const unsigned long long MAC_ADDRESS_MULTICAST_MASK = 1ULL << 40; + constexpr int MAX_MAC_SIZE = 18; constexpr int LONG_TO_BYTE_SIZE = 8; constexpr int MAC_ADDRESS_ETHER_ADDR_LEN = 6; -- Gitee From ce4e37bbe0fa8e3c2237220815e88432cc0206c3 Mon Sep 17 00:00:00 2001 From: chen yi wen <15068825070@163.com> Date: Tue, 19 Aug 2025 01:59:35 +0000 Subject: [PATCH 07/19] 1 Signed-off-by: chen yi wen <15068825070@163.com> --- .../wifi_manage/wifi_sta_sa/wifi_device_stub.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta_sa/wifi_device_stub.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta_sa/wifi_device_stub.cpp index 7a4058646..3a912e2c6 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta_sa/wifi_device_stub.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta_sa/wifi_device_stub.cpp @@ -131,10 +131,10 @@ void WifiDeviceStub::InitHandleMapEx2() MessageParcel &data, MessageParcel &reply) { OnSetDpiMarkRule(code, data, reply); }; handleFuncMap[static_cast(DevInterfaceCode::WIFI_SVR_CMD_IS_FEATURE_SUPPORTED)] = [this](uint32_t code, MessageParcel &data, MessageParcel &reply) { OnIsFeatureSupported(code, data, reply); }; - handleFuncMap[static_cast(DevInterfaceCode::WIFI_SVR_CMD_NETWORK_LAG_INFO)] = [this](uint32_t code, - MessageParcel &data, MessageParcel &reply) { OnUpdateNetworkLagInfo(code, data, reply); }; handleFuncMap[static_cast(DevInterfaceCode::WIFI_SVR_CMD_GET_NET_CONTROL_INFO)] = [this](uint32_t code, MessageParcel &data, MessageParcel &reply) { OnReceiveNetworkControlInfo(code, data, reply); }; + handleFuncMap[static_cast(DevInterfaceCode::WIFI_SVR_CMD_NETWORK_LAG_INFO)] = [this](uint32_t code, + MessageParcel &data, MessageParcel &reply) { OnUpdateNetworkLagInfo(code, data, reply); }; handleFuncMap[static_cast(DevInterfaceCode::WIFI_SVR_CMD_FETCH_SIGNALINFO_VOWIFI)] = [this](uint32_t code, MessageParcel &data, MessageParcel &reply) { OnFetchWifiSignalInfoForVoWiFi(code, data, reply); }; handleFuncMap[static_cast(DevInterfaceCode::WIFI_SVR_CMD_IS_SUPPORT_VOWIFI_DETECT)] = [this] @@ -153,8 +153,6 @@ void WifiDeviceStub::InitHandleMapEx2() (uint32_t code, MessageParcel &data, MessageParcel &reply) { OnStartWifiDetection(code, data, reply); }; handleFuncMap[static_cast(DevInterfaceCode::WIFI_SVR_CMD_GET_MULTI_LINKED_INFO)] = [this] (uint32_t code, MessageParcel &data, MessageParcel &reply) { OnGetMultiLinkedInfo(code, data, reply); }; - handleFuncMap[static_cast(DevInterfaceCode::WIFI_SVR_CMD_GET_SIGNALPOLL_INFO_ARRAY)] = [this] - (uint32_t code, MessageParcel &data, MessageParcel &reply) { OnGetSignalPollInfoArray(code, data, reply); }; } void WifiDeviceStub::InitHandleMap() -- Gitee From a67684f28f7f6fd5414b27a9f6c376b8b7aeaa1c Mon Sep 17 00:00:00 2001 From: chen yi wen <15068825070@163.com> Date: Tue, 19 Aug 2025 03:48:00 +0000 Subject: [PATCH 08/19] 1 Signed-off-by: chen yi wen <15068825070@163.com> --- .../wifi_manage/wifi_sub_manage/wifi_msdp_state_listener.cpp | 2 +- .../wifi_manage/wifi_sub_manage/wifi_msdp_state_listener.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sub_manage/wifi_msdp_state_listener.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sub_manage/wifi_msdp_state_listener.cpp index 992abe52e..243328d55 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sub_manage/wifi_msdp_state_listener.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sub_manage/wifi_msdp_state_listener.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) Huawei Technologies Co., Ltd. 2023. All rights reserved. + * Copyright (c) 2023 Huawei Device Co., Ltd. * 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 diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sub_manage/wifi_msdp_state_listener.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sub_manage/wifi_msdp_state_listener.h index 29891afa2..cbcae9827 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sub_manage/wifi_msdp_state_listener.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sub_manage/wifi_msdp_state_listener.h @@ -1,5 +1,5 @@ /* - * Copyright (c) Huawei Technologies Co., Ltd. 2023. All rights reserved. + * Copyright (c) 2023 Huawei Device Co., Ltd. * 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 -- Gitee From 4a3b80445f9a7fadbf14ec06949cc8eeca6d4f55 Mon Sep 17 00:00:00 2001 From: chen yi wen <15068825070@163.com> Date: Tue, 19 Aug 2025 06:17:02 +0000 Subject: [PATCH 09/19] 1 Signed-off-by: chen yi wen <15068825070@163.com> --- .../wifi_manage/wifi_sub_manage/wifi_msdp_state_listener.cpp | 2 +- .../wifi_manage/wifi_sub_manage/wifi_msdp_state_listener.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sub_manage/wifi_msdp_state_listener.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sub_manage/wifi_msdp_state_listener.cpp index 243328d55..38bcf6c51 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sub_manage/wifi_msdp_state_listener.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sub_manage/wifi_msdp_state_listener.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * 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 diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sub_manage/wifi_msdp_state_listener.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sub_manage/wifi_msdp_state_listener.h index cbcae9827..b871408a0 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sub_manage/wifi_msdp_state_listener.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sub_manage/wifi_msdp_state_listener.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * 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 -- Gitee From 8c914d0125d048296137bba6e355c40ccfd62754 Mon Sep 17 00:00:00 2001 From: chen yi wen <15068825070@163.com> Date: Tue, 19 Aug 2025 06:18:07 +0000 Subject: [PATCH 10/19] 1 Signed-off-by: chen yi wen <15068825070@163.com> --- .../wifi_framework/wifi_toolkit/config/wifi_config_center.h | 1 + 1 file changed, 1 insertion(+) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_center.h b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_center.h index 80302c971..2193901b3 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_center.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/config/wifi_config_center.h @@ -29,6 +29,7 @@ #define STA_INSTANCE_MAX_NUM 2 #endif #define SOFT_BUS_SERVICE_UID 1024 +#define WAUDIO_SERVICE_UID 7056 #define CAST_ENGINE_SERVICE_UID 5526 #define MIRACAST_SERVICE_UID 5529 #define MIRACAST_SERVICE_SA_ID 5527 -- Gitee From a71ba12925e7b5309c1e48a26dda7c87b984688d Mon Sep 17 00:00:00 2001 From: chen yi wen <15068825070@163.com> Date: Tue, 19 Aug 2025 08:04:08 +0000 Subject: [PATCH 11/19] 1 Signed-off-by: chen yi wen <15068825070@163.com> --- .../main/ets/pages/subManualApiTest/subWifiTest/wifiFound.ets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subManualApiTest/subWifiTest/wifiFound.ets b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subManualApiTest/subWifiTest/wifiFound.ets index 7562a1ca0..3c71150ed 100644 --- a/wifi/test/wifi_testapp/entry/src/main/ets/pages/subManualApiTest/subWifiTest/wifiFound.ets +++ b/wifi/test/wifi_testapp/entry/src/main/ets/pages/subManualApiTest/subWifiTest/wifiFound.ets @@ -190,4 +190,4 @@ struct WifiFound { wifi.off('wifiConnectionChange') wifi.off('wifiStateChange') } -} \ No newline at end of file +} -- Gitee From 0ea08bad38fd5efc70a1559cd6ce96a1cb5149bb Mon Sep 17 00:00:00 2001 From: chen yi wen <15068825070@163.com> Date: Tue, 19 Aug 2025 08:49:27 +0000 Subject: [PATCH 12/19] 1 Signed-off-by: chen yi wen <15068825070@163.com> --- wifi/test/wifi_testapp/build-profile.json5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wifi/test/wifi_testapp/build-profile.json5 b/wifi/test/wifi_testapp/build-profile.json5 index 151c5bed6..0955cff2c 100644 --- a/wifi/test/wifi_testapp/build-profile.json5 +++ b/wifi/test/wifi_testapp/build-profile.json5 @@ -57,4 +57,4 @@ ] } ] -} \ No newline at end of file +} -- Gitee From 8c6a3a9d108ed6854c1ef8d5f6062bb6e55a625a Mon Sep 17 00:00:00 2001 From: chen yi wen <15068825070@163.com> Date: Tue, 19 Aug 2025 11:58:01 +0000 Subject: [PATCH 13/19] 1 Signed-off-by: chen yi wen <15068825070@163.com> --- .../wifi_p2p/test/Mock/mock_wifi_p2p_hal_interface.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_p2p_hal_interface.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_p2p_hal_interface.h index 8ad543b56..99e43ebf3 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_p2p_hal_interface.h +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_p2p_hal_interface.h @@ -93,6 +93,8 @@ public: virtual WifiErrorNo GroupClientRemove(const std::string &deviceMac) const = 0; virtual WifiErrorNo P2pReject(const std::string &mac); virtual WifiErrorNo SetMiracastSinkConfig(const std::string &config); + virtual WifiErrorNo TempGroupAdd(int freq); + virtual WifiErrorNo P2pSetTempConfig(int networkId, const HalP2pGroupConfig &config) const = 0; virtual WifiErrorNo SetP2pHighPerf(bool isEnable); }; @@ -165,8 +167,10 @@ public: MOCK_CONST_METHOD1(GroupClientRemove, WifiErrorNo(const std::string &deviceMac)); MOCK_METHOD1(P2pReject, WifiErrorNo(const std::string &mac)); MOCK_METHOD1(SetMiracastSinkConfig, WifiErrorNo(const std::string &config)); + MOCK_METHOD1(TempGroupAdd, WifiErrorNo(int freq)); + MOCK_CONST_METHOD2(P2pSetTempConfig, WifiErrorNo(int networkId, const HalP2pGroupConfig &config)); MOCK_METHOD1(SetP2pHighPerf, WifiErrorNo(bool isEnable)); }; } // namespace Wifi } // namespace OHOS -#endif \ No newline at end of file +#endif -- Gitee From 46c7a8dc501d51b57a6b885bf537d31a3468e1f6 Mon Sep 17 00:00:00 2001 From: chen yi wen <15068825070@163.com> Date: Tue, 19 Aug 2025 12:24:13 +0000 Subject: [PATCH 14/19] 1 Signed-off-by: chen yi wen <15068825070@163.com> --- .../wifi_framework/wifi_manage/wifi_ap/ap_service_test.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service_test.cpp index 6d806abb8..d27c914f9 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service_test.cpp +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service_test.cpp @@ -277,7 +277,7 @@ HWTEST_F(ApService_test, OnWifiCountryCodeChangedSuccess, TestSize.Level1) EXPECT_EQ(ErrCode::WIFI_OPT_SUCCESS, pApService->m_apObserver->OnWifiCountryCodeChanged(countryCode)); } -HWTEST_F(ApService_test, GetPowerModelTest, TestSize.Level1) +HWTEST_F(ApService_test, GetHotspotModeTest, TestSize.Level1) { WIFI_LOGI("GetPowerModelTest enter"); HotspotMode mode = HotspotMode::NONE; @@ -295,4 +295,4 @@ HWTEST_F(ApService_test, SetHotspotModeTest, TestSize.Level1) EXPECT_EQ(mode, HotspotMode::RPT); } } // namespace Wifi -} // namespace OHOS \ No newline at end of file +} // namespace OHOS -- Gitee From 19e0b7b7524241b0fe32d2ed2abf41efcc19c795 Mon Sep 17 00:00:00 2001 From: chen yi wen <15068825070@163.com> Date: Wed, 20 Aug 2025 01:40:30 +0000 Subject: [PATCH 15/19] 1 Signed-off-by: chen yi wen <15068825070@163.com> --- wifi/test/wifi_standard/precompiled_macro/BUILD.gn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wifi/test/wifi_standard/precompiled_macro/BUILD.gn b/wifi/test/wifi_standard/precompiled_macro/BUILD.gn index 176443ea6..6a97ad4e5 100644 --- a/wifi/test/wifi_standard/precompiled_macro/BUILD.gn +++ b/wifi/test/wifi_standard/precompiled_macro/BUILD.gn @@ -97,6 +97,7 @@ ohos_unittest("precompiled_macro_unittest") { deps = [ "$WIFI_ROOT_DIR/base:wifi_base", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta_ext:wifi_sta_ext_service", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_device_ability", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_hotspot_ability", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service", @@ -105,9 +106,8 @@ ohos_unittest("precompiled_macro_unittest") { "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_common:wifi_common_service", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_native:wifi_native", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan:wifi_scan_service", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_self_cure:wifi_self_cure", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta:wifi_sta_service", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta_ext:wifi_sta_ext_service", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_self_cure:wifi_self_cure", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_toolkit:wifi_toolkit", "$WIFI_ROOT_DIR/utils:wifi_utils", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta_ext:wifi_telephony_utils", -- Gitee From fb745936ba1fa4e137f01858242c59065f1e100e Mon Sep 17 00:00:00 2001 From: chen yi wen <15068825070@163.com> Date: Wed, 20 Aug 2025 02:51:18 +0000 Subject: [PATCH 16/19] =?UTF-8?q?=E8=93=9D=E9=BB=84=E5=B7=AE=E5=BC=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chen yi wen <15068825070@163.com> --- README_zh.md | 3 +++ wifi/test/wifi_standard/native/wifi_p2p_callback_stub_test.cpp | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/README_zh.md b/README_zh.md index bf2c8e53d..5b64ca0e2 100644 --- a/README_zh.md +++ b/README_zh.md @@ -1,3 +1,6 @@ +/self_cure_state_machine_test.cpp在 +HWTEST_F(SelfCureStateMachineTest, GetCurrentRssiTest, TestSize.Level1)加上pSelfCureStateMachine_->GetCurrentRssi(); +https://gitee.com/openharmony/communication_wifi/pulls/4417/files 还原wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_native/client/hdi_client/wifi_hdi_wpa_client_test.cpp # WLAN组件 - [简介](#section11660541593) diff --git a/wifi/test/wifi_standard/native/wifi_p2p_callback_stub_test.cpp b/wifi/test/wifi_standard/native/wifi_p2p_callback_stub_test.cpp index 5c5dd4605..31dc739e1 100644 --- a/wifi/test/wifi_standard/native/wifi_p2p_callback_stub_test.cpp +++ b/wifi/test/wifi_standard/native/wifi_p2p_callback_stub_test.cpp @@ -393,4 +393,4 @@ HWTEST_F(WifiP2pCallbackStubTest, IsRemoteDiedTest, TestSize.Level1) EXPECT_TRUE(pWifiP2pCallbackStub->IsRemoteDied() == false); } } // namespace Wifi -} // namespace OHOS +} // namespace OHOS \ No newline at end of file -- Gitee From bd866f1235387f0780b2a8a556e9a69660a22854 Mon Sep 17 00:00:00 2001 From: chen yi wen <15068825070@163.com> Date: Wed, 20 Aug 2025 03:10:35 +0000 Subject: [PATCH 17/19] 1 Signed-off-by: chen yi wen <15068825070@163.com> --- README_zh.md | 3 --- .../hdi_client/wifi_hdi_wpa_client_test.cpp | 21 +++++++++++++++++-- .../wifi_sta/self_cure_state_machine_test.cpp | 1 + 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/README_zh.md b/README_zh.md index 5b64ca0e2..bf2c8e53d 100644 --- a/README_zh.md +++ b/README_zh.md @@ -1,6 +1,3 @@ -/self_cure_state_machine_test.cpp在 -HWTEST_F(SelfCureStateMachineTest, GetCurrentRssiTest, TestSize.Level1)加上pSelfCureStateMachine_->GetCurrentRssi(); -https://gitee.com/openharmony/communication_wifi/pulls/4417/files 还原wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_native/client/hdi_client/wifi_hdi_wpa_client_test.cpp # WLAN组件 - [简介](#section11660541593) diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_native/client/hdi_client/wifi_hdi_wpa_client_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_native/client/hdi_client/wifi_hdi_wpa_client_test.cpp index 4b74caf03..cf9d20739 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_native/client/hdi_client/wifi_hdi_wpa_client_test.cpp +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_native/client/hdi_client/wifi_hdi_wpa_client_test.cpp @@ -27,6 +27,7 @@ using ::testing::ext::TestSize; namespace OHOS { namespace Wifi { +const std::string g_errLog = "wifi_test"; class WifiHdiWpaClientTest : public testing::Test { public: static void SetUpTestCase() {} @@ -1389,17 +1390,33 @@ HWTEST_F(WifiHdiWpaClientTest, ReqP2pHid2dConnectTest, TestSize.Level1) EXPECT_EQ(result, WIFI_HAL_OPT_FAILED); } -HWTEST_F(WifiHdiWpaClientTest, SetWapiConfigTest, TestSize.Level1) +HWTEST_F(WifiHdiWpaClientTest, SetWapiConfigTest01, TestSize.Level1) { WifiHalDeviceConfig config; SetNetworkConfig conf; int num = 0; wifiHdiWpaClient->SetWapiConfig(config, &conf, num); + EXPECT_FALSE(g_errLog.find("service is null")!=std::string::npos); +} + +HWTEST_F(WifiHdiWpaClientTest, SetWapiConfigTest02, TestSize.Level1) +{ + WifiHalDeviceConfig config; + SetNetworkConfig conf; + int num = 0; config.keyMgmt = KEY_MGMT_WAPI_PSK; wifiHdiWpaClient->SetWapiConfig(config, &conf, num); + EXPECT_FALSE(g_errLog.find("service is null")!=std::string::npos); +} + +HWTEST_F(WifiHdiWpaClientTest, SetWapiConfigTest03, TestSize.Level1) +{ + WifiHalDeviceConfig config; + SetNetworkConfig conf; + int num = 0; config.keyMgmt = KEY_MGMT_WAPI_CERT; wifiHdiWpaClient->SetWapiConfig(config, &conf, num); - EXPECT_NE(num, 0); + EXPECT_FALSE(g_errLog.find("service is null")!=std::string::npos); } HWTEST_F(WifiHdiWpaClientTest, ReqWpaGetPskPassphraseTest, TestSize.Level1) diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/self_cure_state_machine_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/self_cure_state_machine_test.cpp index 5d1b112a3..9baa2ce1f 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/self_cure_state_machine_test.cpp +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/self_cure_state_machine_test.cpp @@ -3053,6 +3053,7 @@ HWTEST_F(SelfCureStateMachineTest, SetHttpMonitorStatusTest, TestSize.Level1) HWTEST_F(SelfCureStateMachineTest, GetCurrentRssiTest, TestSize.Level1) { + pSelfCureStateMachine_->GetCurrentRssi(); EXPECT_EQ(pSelfCureStateMachine_->GetCurrentRssi(), 0); } -- Gitee From 659182f8d0ba7d75e472f582b7d2df786e52084f Mon Sep 17 00:00:00 2001 From: chen yi wen <15068825070@163.com> Date: Wed, 20 Aug 2025 07:25:31 +0000 Subject: [PATCH 18/19] 1 Signed-off-by: chen yi wen <15068825070@163.com> --- .../wifi_native/client/hdi_client/hdi_interface/wifi_hdi_util.c | 1 - 1 file changed, 1 deletion(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_native/client/hdi_client/hdi_interface/wifi_hdi_util.c b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_native/client/hdi_client/hdi_interface/wifi_hdi_util.c index 7bd770192..1abc093bd 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_native/client/hdi_client/hdi_interface/wifi_hdi_util.c +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_native/client/hdi_client/hdi_interface/wifi_hdi_util.c @@ -16,7 +16,6 @@ #include "securec.h" #include "wifi_hdi_util.h" #include "wifi_common_def.h" -#include #ifndef UT_TEST #include "wifi_log.h" -- Gitee From 6ac6002a13d8e323b34159d3d2d67010582626a9 Mon Sep 17 00:00:00 2001 From: chen yi wen <15068825070@163.com> Date: Fri, 22 Aug 2025 06:17:57 +0000 Subject: [PATCH 19/19] 1 Signed-off-by: chen yi wen <15068825070@163.com> --- .../wifi_framework/wifi_manage/wifi_native/BUILD.gn | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_native/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_native/BUILD.gn index e7688a72f..98b08d84d 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_native/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_native/BUILD.gn @@ -180,10 +180,6 @@ if (defined(ohos_lite)) { "AP_INSTANCE_MAX_NUM=$wifi_feature_with_ap_num", ] - if (wifi_feature_non_seperate_p2p) { - defines += [ "NON_SEPERATE_P2P" ] - } - configs = [ ":wifi_fw_common_header" ] deps = [ @@ -239,4 +235,4 @@ if (defined(ohos_lite)) { part_name = "wifi" subsystem_name = "communication" } -} +} \ No newline at end of file -- Gitee