diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp index 8b6db8e59392a3e4400d224acb0ce2951d713f7a..f42c5c98b96b48d94ac76c89e0d229c4c8221c80 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp @@ -705,7 +705,6 @@ ErrCode StaService::AllowAutoConnect(int32_t networkId, bool isAllowed) const WIFI_LOGI("AllowAutoConnect, networkid is not correct, linked networkid:%{public}d", linkedInfo.networkId); return WIFI_OPT_SUCCESS; } - Disconnect(); } return WIFI_OPT_SUCCESS; } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp index e9910c5df176b64e3cb2c552d5576a4800ea6ebc..5d4817234a21f6e68411e245addd4070ee6f219a 100755 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp @@ -4425,7 +4425,6 @@ ErrCode StaStateMachine::StartConnectToNetwork(int networkId, const std::string return WIFI_OPT_FAILED; } if (connTriggerMode == NETWORK_SELECTED_BY_USER) { - SetAllowAutoConnectStatus(networkId, true); BlockConnectService::GetInstance().EnableNetworkSelectStatus(networkId); #ifndef OHOS_ARCH_LITE BlockConnectService::GetInstance().ReleaseUnusableBssidSet(); @@ -4479,22 +4478,6 @@ ErrCode StaStateMachine::StartConnectToNetwork(int networkId, const std::string return WIFI_OPT_SUCCESS; } -void StaStateMachine::SetAllowAutoConnectStatus(int32_t networkId, bool status) -{ - WifiDeviceConfig deviceConfig; - if (WifiSettings::GetInstance().GetDeviceConfig(networkId, deviceConfig, m_instId) != 0) { - WIFI_LOGE("SetAllowAutoConnectStatus get GetDeviceConfig failed!"); - return; - } - if (deviceConfig.isAllowAutoConnect == status) { - return; - } - - deviceConfig.isAllowAutoConnect = status; - WifiSettings::GetInstance().AddDeviceConfig(deviceConfig); - WifiSettings::GetInstance().SyncDeviceConfig(); -} - void StaStateMachine::MacAddressGenerate(WifiStoreRandomMac &randomMacInfo) { WIFI_LOGD("enter MacAddressGenerate\n"); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h index 1121ab81939287060dad2bd7499e43100da1e390..a3354ebbec7311ab5d8a8bb1ce84d44afa8b07d9 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h @@ -610,8 +610,6 @@ private: */ void AutoSelectConnectToNetwork(const std::string& bssid, std::string& ifaceName); - void SetAllowAutoConnectStatus(int32_t networkId, bool status); - /** * @Description Disconnect network *