From 54f2c5920310171c01fe02c5b145c87a41788e73 Mon Sep 17 00:00:00 2001 From: shihaojie Date: Tue, 5 Aug 2025 08:37:48 +0000 Subject: [PATCH 1/2] 1 Signed-off-by: shihaojie --- .../wifi_pro/perf_5g/perf_5g_handover_service.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_pro/perf_5g/perf_5g_handover_service.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_pro/perf_5g/perf_5g_handover_service.cpp index caab08b12..0ceaf24bb 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_pro/perf_5g/perf_5g_handover_service.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_pro/perf_5g/perf_5g_handover_service.cpp @@ -58,16 +58,16 @@ void Perf5gHandoverService::OnConnected(WifiLinkedInfo &wifiLinkedInfo) InitConnectedAp(wifiLinkedInfo, wifiDeviceConfig); connectedAp_->is5gAfterPerf = is5gAfterPerf; connectedAp_->perf5gStrategyName = strategyName; - bool isItCustNetwork = false; + bool isHwItCustNetwork = false; IEnhanceService *pEnhanceService = WifiServiceManager::GetInstance().GetEnhanceServiceInst(); if (pEnhanceService != nullptr) { - isItCustNetwork = pEnhanceService->IsItCustNetwork(wifiDeviceConfig); + isHwItCustNetwork = pEnhanceService->IsHwItCustNetwork(wifiDeviceConfig); } bool isEnterprise = DualBandUtils::IsEnterprise(wifiDeviceConfig); - connectedAp_->canNotPerf = isEnterprise || wifiLinkedInfo.isDataRestricted || isItCustNetwork || + connectedAp_->canNotPerf = isEnterprise || wifiLinkedInfo.isDataRestricted || isHwItCustNetwork || wifiDeviceConfig.keyMgmt == KEY_MGMT_NONE || connectedAp_->wifiLinkType == WifiLinkType::WIFI7_EMLSR; - WIFI_LOGI("OnConnected, canNotPerf:isEnterprise(%{public}d),isItCustNetwork(%{public}d),isPortal(%{public}d)," - "isDataRestricted(%{public}d),openNet(%{public}d), isEMLSR(%{public}d)", isEnterprise, isItCustNetwork, + WIFI_LOGI("OnConnected, canNotPerf:isEnterprise(%{public}d),isHwItCustNetwork(%{public}d),isPortal(%{public}d)," + "isDataRestricted(%{public}d),openNet(%{public}d), isEMLSR(%{public}d)", isEnterprise, isHwItCustNetwork, wifiDeviceConfig.isPortal, wifiLinkedInfo.isDataRestricted, wifiDeviceConfig.keyMgmt == KEY_MGMT_NONE, connectedAp_->wifiLinkType == WifiLinkType::WIFI7_EMLSR); if (connectedAp_->canNotPerf) { -- Gitee From 399302fad1cbfd96b9276fd6aa852f5a1487f66f Mon Sep 17 00:00:00 2001 From: shihaojie Date: Tue, 5 Aug 2025 08:39:45 +0000 Subject: [PATCH 2/2] 1 Signed-off-by: shihaojie --- .../wifi_framework/wifi_manage/wifi_scan/scan_interface.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_interface.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_interface.cpp index f4ba82b63..fd2082f8b 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_interface.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_interface.cpp @@ -65,6 +65,7 @@ ErrCode ScanInterface::UnInit() return WIFI_OPT_SUCCESS; } +// scanType takes precedence over externFlag, when scanType is not SCAN_DEFAULT, externFlag invalid ErrCode ScanInterface::Scan(bool externFlag, ScanType scanType) { WIFI_LOGI("Enter ScanInterface::Scan\n"); @@ -76,6 +77,7 @@ ErrCode ScanInterface::Scan(bool externFlag, ScanType scanType) return pScanService->Scan(externFlag ? ScanType::SCAN_TYPE_EXTERN : ScanType::SCAN_TYPE_NATIVE_EXTERN); } +// scanType takes precedence over externFlag, when scanType is not SCAN_DEFAULT, externFlag invalid ErrCode ScanInterface::ScanWithParam(const WifiScanParams &wifiScanParams, bool externFlag, ScanType scanType) { WIFI_LOGI("Enter ScanInterface::ScanWithParam\n"); @@ -250,4 +252,4 @@ ErrCode ScanInterface::ResetScanInterval() return WIFI_OPT_SUCCESS; } } // namespace Wifi -} // namespace OHOS +} // namespace OHOS \ No newline at end of file -- Gitee