From 097c7a30fa3390de482b9b363867cdb5c15c2e76 Mon Sep 17 00:00:00 2001 From: shihaojie Date: Thu, 17 Jul 2025 13:45:31 +0000 Subject: [PATCH 1/2] 1 Signed-off-by: shihaojie --- .../wifi_manage/network_select/wifi_filter_impl.cpp | 4 +++- .../wifi_manage/wifi_pro/perf_5g/perf_5g_handover_service.cpp | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/network_select/wifi_filter_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/network_select/wifi_filter_impl.cpp index ddbed4bed..d59c67693 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/network_select/wifi_filter_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/network_select/wifi_filter_impl.cpp @@ -476,6 +476,8 @@ bool SignalLevelFilter::Filter(NetworkCandidate &networkCandidate) if (signalLevel > SIGNAL_LEVEL_TWO) { return true; } + WIFI_LOGI("SignalLevelFilter, rssi:%{public}d, band:%{public}d, skip candidate:%{public}s", interScanInfo.rssi, + interScanInfo.band, networkCandidate.ToString().c_str()); networkCandidate.filtedReason[filterName].insert(FiltedReason::POOR_SIGNAL); return false; } @@ -634,7 +636,7 @@ bool ValidConfigNetworkFilter::Filter(NetworkCandidate &networkCandidate) // disable network filtering auto &networkSelectionStatus = networkCandidate.wifiDeviceConfig.networkSelectionStatus; - if (networkSelectionStatus.networkSelectionDisableReason != DisabledReason::DISABLED_NONE || + if (networkSelectionStatus.status != WifiDeviceConfigStatus::ENABLED || !networkCandidate.wifiDeviceConfig.isAllowAutoConnect) { WIFI_LOGI("ValidConfigNetworkFilter, disable network, skip candidate:%{public}s", networkCandidate.ToString().c_str()); 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 93606b403..d1df00aff 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 @@ -368,7 +368,7 @@ void Perf5gHandoverService::Monitor5gAp(std::vector &wifiScanInfo { perf5gChrInfo_.isIn5gPref = true; if (WifiProUtils::IsUserSelectNetwork()) { - WIFI_LOGD("Monitor5gAp, IsUserSelectNetwork, can not monitor"); + WIFI_LOGI("Monitor5gAp, IsUserSelectNetwork, can not monitor"); perf5gChrInfo_.isUserConnected = true; return; } -- Gitee From 0c6ac6e36159c379f5fc0d90d5317cef0c6bb92b Mon Sep 17 00:00:00 2001 From: shihaojie Date: Fri, 25 Jul 2025 02:56:46 +0000 Subject: [PATCH 2/2] 1 Signed-off-by: shihaojie --- .../wifi_manage/network_select/wifi_filter_impl.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/network_select/wifi_filter_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/network_select/wifi_filter_impl.cpp index d59c67693..5d0114700 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/network_select/wifi_filter_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/network_select/wifi_filter_impl.cpp @@ -476,8 +476,6 @@ bool SignalLevelFilter::Filter(NetworkCandidate &networkCandidate) if (signalLevel > SIGNAL_LEVEL_TWO) { return true; } - WIFI_LOGI("SignalLevelFilter, rssi:%{public}d, band:%{public}d, skip candidate:%{public}s", interScanInfo.rssi, - interScanInfo.band, networkCandidate.ToString().c_str()); networkCandidate.filtedReason[filterName].insert(FiltedReason::POOR_SIGNAL); return false; } -- Gitee