diff --git a/wifi/frameworks/native/src/wifi_device_callback_stub.cpp b/wifi/frameworks/native/src/wifi_device_callback_stub.cpp index 4fd93dee8fa5979ef14a59cb0ef656d6addf6dc3..db43d2a410f46a1d2c99eca00a7fe90388b24fd0 100644 --- a/wifi/frameworks/native/src/wifi_device_callback_stub.cpp +++ b/wifi/frameworks/native/src/wifi_device_callback_stub.cpp @@ -31,9 +31,9 @@ WifiDeviceCallBackStub::~WifiDeviceCallBackStub() int WifiDeviceCallBackStub::OnRemoteRequest( uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) { - WIFI_LOGD("WifiDeviceCallBackStub::OnRemoteRequest!"); + WIFI_LOGI("WifiDeviceCallBackStub::OnRemoteRequest, code:%{public}zu!", code); if (mRemoteDied) { - WIFI_LOGD("Failed to `%{public}s`,Remote service is died!", __func__); + WIFI_LOGE("Failed to `%{public}s`,Remote service is died!", __func__); return -1; } @@ -84,7 +84,7 @@ int WifiDeviceCallBackStub::OnRemoteRequest( void WifiDeviceCallBackStub::RegisterUserCallBack(const sptr &callBack) { if (callBack == nullptr) { - WIFI_LOGD("RegisterUserCallBack:callBack is nullptr!"); + WIFI_LOGE("RegisterUserCallBack:callBack is nullptr!"); return; } callback_ = callBack; @@ -102,7 +102,7 @@ void WifiDeviceCallBackStub::SetRemoteDied(bool val) void WifiDeviceCallBackStub::OnWifiStateChanged(int state) { - WIFI_LOGD("WifiDeviceCallBackStub::OnWifiStateChanged"); + WIFI_LOGI("WifiDeviceCallBackStub::OnWifiStateChanged, state:%{public}d!", state); if (callback_) { callback_->OnWifiStateChanged(state); @@ -112,7 +112,7 @@ void WifiDeviceCallBackStub::OnWifiStateChanged(int state) void WifiDeviceCallBackStub::OnWifiConnectionChanged(int state, const WifiLinkedInfo &info) { - WIFI_LOGD("WifiDeviceCallBackStub::OnWifiConnectionChanged"); + WIFI_LOGI("WifiDeviceCallBackStub::OnWifiConnectionChanged, state:%{public}d!", state); if (callback_) { callback_->OnWifiConnectionChanged(state, info); } @@ -121,7 +121,7 @@ void WifiDeviceCallBackStub::OnWifiConnectionChanged(int state, const WifiLinked void WifiDeviceCallBackStub::OnWifiRssiChanged(int rssi) { - WIFI_LOGD("WifiDeviceCallBackStub::OnWifiRssiChanged"); + WIFI_LOGI("WifiDeviceCallBackStub::OnWifiRssiChanged, rssi:%{public}d!", rssi); if (callback_) { callback_->OnWifiRssiChanged(rssi); } @@ -130,7 +130,7 @@ void WifiDeviceCallBackStub::OnWifiRssiChanged(int rssi) void WifiDeviceCallBackStub::OnWifiWpsStateChanged(int state, const std::string &pinCode) { - WIFI_LOGD("WifiDeviceCallBackStub::OnWifiWpsStateChanged"); + WIFI_LOGI("WifiDeviceCallBackStub::OnWifiWpsStateChanged, state:%{public}d!", state); if (callback_) { callback_->OnWifiWpsStateChanged(state, pinCode); } @@ -138,7 +138,7 @@ void WifiDeviceCallBackStub::OnWifiWpsStateChanged(int state, const std::string void WifiDeviceCallBackStub::OnStreamChanged(int direction) { - WIFI_LOGD("WifiDeviceCallBackStub::OnStreamChanged"); + WIFI_LOGI("WifiDeviceCallBackStub::OnStreamChanged, direction:%{public}d!", direction); if (callback_) { callback_->OnStreamChanged(direction); } @@ -146,7 +146,7 @@ void WifiDeviceCallBackStub::OnStreamChanged(int direction) void WifiDeviceCallBackStub::OnDeviceConfigChanged(ConfigChange value) { - WIFI_LOGD("WifiDeviceCallBackStub::OnDeviceConfigChanged"); + WIFI_LOGI("WifiDeviceCallBackStub::OnDeviceConfigChanged, value:%{public}d!", value); if (callback_) { callback_->OnDeviceConfigChanged(value); } diff --git a/wifi/frameworks/native/src/wifi_device_callback_stub_lite.cpp b/wifi/frameworks/native/src/wifi_device_callback_stub_lite.cpp index 687da4ed65a8d25e965a42616fdf4ea43a4e63c5..bf38b83c267460b58e00edc6b3becb074bdd0681 100644 --- a/wifi/frameworks/native/src/wifi_device_callback_stub_lite.cpp +++ b/wifi/frameworks/native/src/wifi_device_callback_stub_lite.cpp @@ -78,7 +78,7 @@ int WifiDeviceCallBackStub::OnRemoteRequest(uint32_t code, IpcIo *data) void WifiDeviceCallBackStub::RegisterUserCallBack(const std::shared_ptr &callBack) { if (callBack == nullptr) { - WIFI_LOGD("RegisterUserCallBack:callBack is nullptr!"); + WIFI_LOGE("RegisterUserCallBack:callBack is nullptr!"); return; } callback_ = callBack; diff --git a/wifi/frameworks/native/src/wifi_device_proxy.cpp b/wifi/frameworks/native/src/wifi_device_proxy.cpp index 5abbce6a3f2c5c07d71648845251f8446412a55c..2ea1e3fde32ba4bd3b2f1db82a157f26f95de15b 100644 --- a/wifi/frameworks/native/src/wifi_device_proxy.cpp +++ b/wifi/frameworks/native/src/wifi_device_proxy.cpp @@ -1186,7 +1186,7 @@ bool WifiDeviceProxy::SetLowLatencyMode(bool enabled) void WifiDeviceProxy::OnRemoteDied(const wptr &remoteObject) { - WIFI_LOGD("Remote service is died!"); + WIFI_LOGW("Remote service is died!"); mRemoteDied = true; if (g_deviceCallBackStub == nullptr) { WIFI_LOGE("g_deviceCallBackStub is nullptr"); diff --git a/wifi/frameworks/native/src/wifi_device_proxy_lite.cpp b/wifi/frameworks/native/src/wifi_device_proxy_lite.cpp index d0b9cc5b94c00cf6772d5ef070f26938a1fcd28c..3ace17ca9415e78c61b597e169fe7ac2b828582f 100644 --- a/wifi/frameworks/native/src/wifi_device_proxy_lite.cpp +++ b/wifi/frameworks/native/src/wifi_device_proxy_lite.cpp @@ -1245,7 +1245,7 @@ bool WifiDeviceProxy::SetLowLatencyMode(bool enabled) void WifiDeviceProxy::OnRemoteDied(void) { - WIFI_LOGD("Remote service is died!"); + WIFI_LOGW("Remote service is died!"); remoteDied_ = true; g_deviceCallBackStub.SetRemoteDied(true); } diff --git a/wifi/frameworks/native/src/wifi_hotspot_callback_stub.cpp b/wifi/frameworks/native/src/wifi_hotspot_callback_stub.cpp index 648607ee25a88ffb13dbd5127303bd606a45e36b..5a18637d05842dbb06abe4394c103a46b9c39b72 100644 --- a/wifi/frameworks/native/src/wifi_hotspot_callback_stub.cpp +++ b/wifi/frameworks/native/src/wifi_hotspot_callback_stub.cpp @@ -34,7 +34,7 @@ int WifiHotspotCallbackStub::OnRemoteRequest( { WIFI_LOGD("WifiHotspotCallbackStub::OnRemoteRequest!"); if (mRemoteDied) { - WIFI_LOGD("Failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGE("Failed to `%{public}s`,remote service is died!", __func__); return -1; } @@ -113,7 +113,7 @@ void WifiHotspotCallbackStub::RegisterCallBack(const sptr void WifiHotspotCallbackStub::OnHotspotStateChanged(int state) { - WIFI_LOGD("WifiHotspotCallbackStub::OnHotspotStateChanged"); + WIFI_LOGI("WifiHotspotCallbackStub::OnHotspotStateChanged, state:%{public}d.", state); if (userCallback_) { userCallback_->OnHotspotStateChanged(state); } @@ -122,7 +122,7 @@ void WifiHotspotCallbackStub::OnHotspotStateChanged(int state) void WifiHotspotCallbackStub::OnHotspotStaJoin(const StationInfo &info) { - WIFI_LOGD("WifiHotspotCallbackStub::OnHotspotStaJoin"); + WIFI_LOGI("WifiHotspotCallbackStub::OnHotspotStaJoin"); if (userCallback_) { userCallback_->OnHotspotStaJoin(info); } @@ -131,7 +131,7 @@ void WifiHotspotCallbackStub::OnHotspotStaJoin(const StationInfo &info) void WifiHotspotCallbackStub::OnHotspotStaLeave(const StationInfo &info) { - WIFI_LOGD("WifiHotspotCallbackStub::OnHotspotStaLeave"); + WIFI_LOGI("WifiHotspotCallbackStub::OnHotspotStaLeave"); if (userCallback_) { userCallback_->OnHotspotStaLeave(info); } diff --git a/wifi/frameworks/native/src/wifi_hotspot_proxy.cpp b/wifi/frameworks/native/src/wifi_hotspot_proxy.cpp index b1462ccbc6fdb2f36c00b38bb59846faa9fe2a6e..8d09663aa360cfe84d1071a0fa30918d9f3ad0bd 100644 --- a/wifi/frameworks/native/src/wifi_hotspot_proxy.cpp +++ b/wifi/frameworks/native/src/wifi_hotspot_proxy.cpp @@ -108,7 +108,7 @@ ErrCode WifiHotspotProxy::IsHotspotDualBandSupported(bool &isSupported) ErrCode WifiHotspotProxy::GetHotspotState(int &state) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -140,7 +140,7 @@ ErrCode WifiHotspotProxy::GetHotspotState(int &state) ErrCode WifiHotspotProxy::GetHotspotConfig(HotspotConfig &result) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -179,7 +179,7 @@ ErrCode WifiHotspotProxy::GetHotspotConfig(HotspotConfig &result) ErrCode WifiHotspotProxy::SetHotspotConfig(const HotspotConfig &config) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -212,7 +212,7 @@ ErrCode WifiHotspotProxy::SetHotspotConfig(const HotspotConfig &config) ErrCode WifiHotspotProxy::GetStationList(std::vector &result) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -257,7 +257,7 @@ ErrCode WifiHotspotProxy::GetStationList(std::vector &result) ErrCode WifiHotspotProxy::DisassociateSta(const StationInfo &info) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -312,7 +312,7 @@ ErrCode WifiHotspotProxy::EnableHotspot(const ServiceType type) ErrCode WifiHotspotProxy::DisableHotspot(const ServiceType type) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -341,7 +341,7 @@ ErrCode WifiHotspotProxy::DisableHotspot(const ServiceType type) ErrCode WifiHotspotProxy::GetBlockLists(std::vector &infos) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -387,7 +387,7 @@ ErrCode WifiHotspotProxy::GetBlockLists(std::vector &infos) ErrCode WifiHotspotProxy::AddBlockList(const StationInfo &info) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -417,7 +417,7 @@ ErrCode WifiHotspotProxy::AddBlockList(const StationInfo &info) ErrCode WifiHotspotProxy::DelBlockList(const StationInfo &info) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -447,7 +447,7 @@ ErrCode WifiHotspotProxy::DelBlockList(const StationInfo &info) ErrCode WifiHotspotProxy::GetValidBands(std::vector &bands) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -489,7 +489,7 @@ ErrCode WifiHotspotProxy::GetValidBands(std::vector &bands) ErrCode WifiHotspotProxy::GetValidChannels(BandType band, std::vector &validchannels) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -563,7 +563,7 @@ ErrCode WifiHotspotProxy::RegisterCallBack(const sptr &cal ErrCode WifiHotspotProxy::GetSupportedFeatures(long &features) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -594,7 +594,7 @@ ErrCode WifiHotspotProxy::GetSupportedFeatures(long &features) ErrCode WifiHotspotProxy::GetSupportedPowerModel(std::set& setPowerModelList) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -636,7 +636,7 @@ ErrCode WifiHotspotProxy::GetSupportedPowerModel(std::set& setPowerM ErrCode WifiHotspotProxy::GetPowerModel(PowerModel& model) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -668,7 +668,7 @@ ErrCode WifiHotspotProxy::GetPowerModel(PowerModel& model) ErrCode WifiHotspotProxy::SetPowerModel(const PowerModel& model) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -695,7 +695,7 @@ ErrCode WifiHotspotProxy::SetPowerModel(const PowerModel& model) void WifiHotspotProxy::OnRemoteDied(const wptr& remoteObject) { - WIFI_LOGD("Remote service is died!"); + WIFI_LOGW("Remote service is died!"); mRemoteDied = true; if (g_wifiHotspotCallbackStub != nullptr) { g_wifiHotspotCallbackStub->SetRemoteDied(true); diff --git a/wifi/frameworks/native/src/wifi_p2p_callback_stub.cpp b/wifi/frameworks/native/src/wifi_p2p_callback_stub.cpp index 5af404f88d3f7ea26672c10a89b1b7b05d90f5e4..12d13ff182c1b0cd1206be30aaaec757513aa1ba 100644 --- a/wifi/frameworks/native/src/wifi_p2p_callback_stub.cpp +++ b/wifi/frameworks/native/src/wifi_p2p_callback_stub.cpp @@ -96,7 +96,7 @@ void WifiP2pCallbackStub::SetRemoteDied(bool val) void WifiP2pCallbackStub::OnP2pStateChanged(int state) { - WIFI_LOGD("WifiP2pCallbackStub::OnP2pStateChanged: %{public}d", state); + WIFI_LOGI("WifiP2pCallbackStub::OnP2pStateChanged: %{public}d", state); if (userCallback_) { userCallback_->OnP2pStateChanged(state); } @@ -105,7 +105,7 @@ void WifiP2pCallbackStub::OnP2pStateChanged(int state) void WifiP2pCallbackStub::OnP2pPersistentGroupsChanged(void) { - WIFI_LOGD("WifiP2pCallbackStub::OnP2pPersistentGroupsChanged"); + WIFI_LOGI("WifiP2pCallbackStub::OnP2pPersistentGroupsChanged"); if (userCallback_) { userCallback_->OnP2pPersistentGroupsChanged(); } @@ -114,7 +114,7 @@ void WifiP2pCallbackStub::OnP2pPersistentGroupsChanged(void) void WifiP2pCallbackStub::OnP2pThisDeviceChanged(const WifiP2pDevice &device) { - WIFI_LOGD("WifiP2pCallbackStub::OnP2pThisDeviceChanged"); + WIFI_LOGI("WifiP2pCallbackStub::OnP2pThisDeviceChanged"); if (userCallback_) { userCallback_->OnP2pThisDeviceChanged(device); } @@ -123,7 +123,7 @@ void WifiP2pCallbackStub::OnP2pThisDeviceChanged(const WifiP2pDevice &device) void WifiP2pCallbackStub::OnP2pPeersChanged(const std::vector &device) { - WIFI_LOGD("WifiP2pCallbackStub::OnP2pPeersChanged"); + WIFI_LOGI("WifiP2pCallbackStub::OnP2pPeersChanged"); if (userCallback_) { userCallback_->OnP2pPeersChanged(device); } @@ -132,7 +132,7 @@ void WifiP2pCallbackStub::OnP2pPeersChanged(const std::vector &de void WifiP2pCallbackStub::OnP2pServicesChanged(const std::vector &srvInfo) { - WIFI_LOGD("WifiP2pCallbackStub::OnP2pServicesChanged"); + WIFI_LOGI("WifiP2pCallbackStub::OnP2pServicesChanged"); if (userCallback_) { userCallback_->OnP2pServicesChanged(srvInfo); } @@ -140,7 +140,7 @@ void WifiP2pCallbackStub::OnP2pServicesChanged(const std::vector(info.GetConnectState())); + WIFI_LOGI("WifiP2pCallbackStub::OnP2pConnectionChanged: %{public}d", static_cast(info.GetConnectState())); if (userCallback_) { userCallback_->OnP2pConnectionChanged(info); } @@ -149,7 +149,7 @@ void WifiP2pCallbackStub::OnP2pConnectionChanged(const WifiP2pLinkedInfo &info) void WifiP2pCallbackStub::OnP2pDiscoveryChanged(bool isChange) { - WIFI_LOGD("WifiP2pCallbackStub::OnP2pDiscoveryChanged"); + WIFI_LOGI("WifiP2pCallbackStub::OnP2pDiscoveryChanged, isChange:%{public}d", isChange); if (userCallback_) { userCallback_->OnP2pDiscoveryChanged(isChange); } @@ -158,7 +158,7 @@ void WifiP2pCallbackStub::OnP2pDiscoveryChanged(bool isChange) void WifiP2pCallbackStub::OnP2pActionResult(P2pActionCallback action, ErrCode code) { - WIFI_LOGD("WifiP2pCallbackStub::OnP2pActionResult"); + WIFI_LOGI("WifiP2pCallbackStub::OnP2pActionResult"); if (userCallback_) { userCallback_->OnP2pActionResult(action, code); } @@ -166,7 +166,7 @@ void WifiP2pCallbackStub::OnP2pActionResult(P2pActionCallback action, ErrCode co void WifiP2pCallbackStub::OnConfigChanged(CfgType type, char* data, int dataLen) { - WIFI_LOGD("WifiP2pCallbackStub::OnConfigChanged"); + WIFI_LOGI("WifiP2pCallbackStub::OnConfigChanged"); if (userCallback_) { userCallback_->OnConfigChanged(type, data, dataLen); } diff --git a/wifi/frameworks/native/src/wifi_p2p_proxy.cpp b/wifi/frameworks/native/src/wifi_p2p_proxy.cpp index 6c1cf344bc6906f732f2ba8b8f86c438b378d426..7ec88adab2ed233e5e5d8e7cb396216deb8eae2d 100644 --- a/wifi/frameworks/native/src/wifi_p2p_proxy.cpp +++ b/wifi/frameworks/native/src/wifi_p2p_proxy.cpp @@ -40,7 +40,7 @@ WifiP2pProxy::~WifiP2pProxy() ErrCode WifiP2pProxy::EnableP2p(void) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -66,7 +66,7 @@ ErrCode WifiP2pProxy::EnableP2p(void) ErrCode WifiP2pProxy::DisableP2p(void) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -93,7 +93,7 @@ ErrCode WifiP2pProxy::DisableP2p(void) ErrCode WifiP2pProxy::DiscoverDevices(void) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -120,7 +120,7 @@ ErrCode WifiP2pProxy::DiscoverDevices(void) ErrCode WifiP2pProxy::StopDiscoverDevices(void) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -148,7 +148,7 @@ ErrCode WifiP2pProxy::StopDiscoverDevices(void) ErrCode WifiP2pProxy::DiscoverServices(void) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -175,7 +175,7 @@ ErrCode WifiP2pProxy::DiscoverServices(void) ErrCode WifiP2pProxy::StopDiscoverServices(void) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -203,7 +203,7 @@ ErrCode WifiP2pProxy::StopDiscoverServices(void) ErrCode WifiP2pProxy::RequestService(const WifiP2pDevice &device, const WifiP2pServiceRequest &request) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -231,7 +231,7 @@ ErrCode WifiP2pProxy::RequestService(const WifiP2pDevice &device, const WifiP2pS ErrCode WifiP2pProxy::PutLocalP2pService(const WifiP2pServiceInfo &srvInfo) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -259,7 +259,7 @@ ErrCode WifiP2pProxy::PutLocalP2pService(const WifiP2pServiceInfo &srvInfo) ErrCode WifiP2pProxy::DeleteLocalP2pService(const WifiP2pServiceInfo &srvInfo) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -288,7 +288,7 @@ ErrCode WifiP2pProxy::DeleteLocalP2pService(const WifiP2pServiceInfo &srvInfo) ErrCode WifiP2pProxy::StartP2pListen(int period, int interval) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -317,7 +317,7 @@ ErrCode WifiP2pProxy::StartP2pListen(int period, int interval) ErrCode WifiP2pProxy::StopP2pListen(void) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -344,7 +344,7 @@ ErrCode WifiP2pProxy::StopP2pListen(void) ErrCode WifiP2pProxy::CreateGroup(const WifiP2pConfig &config) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -372,7 +372,7 @@ ErrCode WifiP2pProxy::CreateGroup(const WifiP2pConfig &config) ErrCode WifiP2pProxy::RemoveGroup() { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -398,7 +398,7 @@ ErrCode WifiP2pProxy::RemoveGroup() ErrCode WifiP2pProxy::DeleteGroup(const WifiP2pGroupInfo &group) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -565,7 +565,7 @@ void WifiP2pProxy::WriteWifiP2pConfigData(MessageParcel &data, const WifiP2pConf ErrCode WifiP2pProxy::P2pConnect(const WifiP2pConfig &config) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -593,7 +593,7 @@ ErrCode WifiP2pProxy::P2pConnect(const WifiP2pConfig &config) ErrCode WifiP2pProxy::P2pCancelConnect() { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -620,7 +620,7 @@ ErrCode WifiP2pProxy::P2pCancelConnect() ErrCode WifiP2pProxy::QueryP2pLinkedInfo(WifiP2pLinkedInfo &linkedInfo) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -655,7 +655,7 @@ ErrCode WifiP2pProxy::QueryP2pLinkedInfo(WifiP2pLinkedInfo &linkedInfo) ErrCode WifiP2pProxy::GetCurrentGroup(WifiP2pGroupInfo &group) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -687,7 +687,7 @@ ErrCode WifiP2pProxy::GetCurrentGroup(WifiP2pGroupInfo &group) ErrCode WifiP2pProxy::GetP2pEnableStatus(int &status) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -719,7 +719,7 @@ ErrCode WifiP2pProxy::GetP2pEnableStatus(int &status) ErrCode WifiP2pProxy::GetP2pDiscoverStatus(int &status) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -751,7 +751,7 @@ ErrCode WifiP2pProxy::GetP2pDiscoverStatus(int &status) ErrCode WifiP2pProxy::GetP2pConnectedStatus(int &status) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -783,7 +783,7 @@ ErrCode WifiP2pProxy::GetP2pConnectedStatus(int &status) ErrCode WifiP2pProxy::QueryP2pDevices(std::vector &devices) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -858,7 +858,7 @@ ErrCode WifiP2pProxy::QueryP2pLocalDevice(WifiP2pDevice &device) ErrCode WifiP2pProxy::QueryP2pGroups(std::vector &groups) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -901,7 +901,7 @@ ErrCode WifiP2pProxy::QueryP2pGroups(std::vector &groups) ErrCode WifiP2pProxy::QueryP2pServices(std::vector &services) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -944,7 +944,7 @@ ErrCode WifiP2pProxy::QueryP2pServices(std::vector &services ErrCode WifiP2pProxy::SetP2pDeviceName(const std::string &deviceName) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -975,7 +975,7 @@ ErrCode WifiP2pProxy::SetP2pDeviceName(const std::string &deviceName) ErrCode WifiP2pProxy::SetP2pWfdInfo(const WifiP2pWfdInfo &wfdInfo) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -1011,7 +1011,7 @@ ErrCode WifiP2pProxy::SetP2pWfdInfo(const WifiP2pWfdInfo &wfdInfo) ErrCode WifiP2pProxy::RegisterCallBack(const sptr &callback) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageParcel data; @@ -1050,7 +1050,7 @@ ErrCode WifiP2pProxy::RegisterCallBack(const sptr &callback) ErrCode WifiP2pProxy::GetSupportedFeatures(long &features) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -1081,7 +1081,7 @@ ErrCode WifiP2pProxy::GetSupportedFeatures(long &features) ErrCode WifiP2pProxy::Hid2dRequestGcIp(const std::string& gcMac, std::string& ipAddr) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -1113,7 +1113,7 @@ ErrCode WifiP2pProxy::Hid2dRequestGcIp(const std::string& gcMac, std::string& ip ErrCode WifiP2pProxy::Hid2dSharedlinkIncrease() { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -1140,7 +1140,7 @@ ErrCode WifiP2pProxy::Hid2dSharedlinkIncrease() ErrCode WifiP2pProxy::Hid2dSharedlinkDecrease() { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -1169,7 +1169,7 @@ ErrCode WifiP2pProxy::Hid2dCreateGroup(const int frequency, FreqType type) WIFI_LOGI("Request hid2d create group"); if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -1200,7 +1200,7 @@ ErrCode WifiP2pProxy::Hid2dRemoveGcGroup(const std::string& gcIfName) WIFI_LOGI("Request hid2d remove group"); if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -1230,7 +1230,7 @@ ErrCode WifiP2pProxy::Hid2dConnect(const Hid2dConnectConfig& config) WIFI_LOGI("Request hid2d connect"); if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -1262,7 +1262,7 @@ ErrCode WifiP2pProxy::Hid2dConnect(const Hid2dConnectConfig& config) ErrCode WifiP2pProxy::Hid2dConfigIPAddr(const std::string& ifName, const IpAddrInfo& ipInfo) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -1293,7 +1293,7 @@ ErrCode WifiP2pProxy::Hid2dConfigIPAddr(const std::string& ifName, const IpAddrI ErrCode WifiP2pProxy::Hid2dReleaseIPAddr(const std::string& ifName) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -1322,7 +1322,7 @@ ErrCode WifiP2pProxy::Hid2dGetRecommendChannel(const RecommendChannelRequest& re RecommendChannelResponse& response) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -1364,7 +1364,7 @@ ErrCode WifiP2pProxy::Hid2dGetRecommendChannel(const RecommendChannelRequest& re ErrCode WifiP2pProxy::Hid2dGetChannelListFor5G(std::vector& vecChannelList) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -1405,12 +1405,12 @@ ErrCode WifiP2pProxy::Hid2dGetSelfWifiCfgInfo(SelfCfgType cfgType, char cfgData[CFG_DATA_MAX_BYTES], int* getDatValidLen) { if (getDatValidLen == nullptr) { - WIFI_LOGD("getDatValidLen is nullptr!"); + WIFI_LOGE("getDatValidLen is nullptr!"); return WIFI_OPT_FAILED; } if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -1444,7 +1444,7 @@ ErrCode WifiP2pProxy::Hid2dGetSelfWifiCfgInfo(SelfCfgType cfgType, return WIFI_OPT_FAILED; } if (memcpy_s(cfgData, CFG_DATA_MAX_BYTES, dataBuffer, *getDatValidLen) != EOK) { - WIFI_LOGD("`%{public}s` memcpy_s failed!", __func__); + WIFI_LOGE("`%{public}s` memcpy_s failed!", __func__); return WIFI_OPT_FAILED; } } @@ -1459,7 +1459,7 @@ ErrCode WifiP2pProxy::Hid2dSetPeerWifiCfgInfo(PeerCfgType cfgType, return WIFI_OPT_INVALID_PARAM; } if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -1488,7 +1488,7 @@ ErrCode WifiP2pProxy::Hid2dSetPeerWifiCfgInfo(PeerCfgType cfgType, ErrCode WifiP2pProxy::Hid2dSetUpperScene(const std::string& ifName, const Hid2dUpperScene& scene) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; diff --git a/wifi/frameworks/native/src/wifi_scan_callback_stub.cpp b/wifi/frameworks/native/src/wifi_scan_callback_stub.cpp index 325dbf0ee0a5af46823f4394ba2576382a0863df..b12092c5e78e0d535247aebeaf2382f8d1f7f015 100644 --- a/wifi/frameworks/native/src/wifi_scan_callback_stub.cpp +++ b/wifi/frameworks/native/src/wifi_scan_callback_stub.cpp @@ -33,7 +33,7 @@ int WifiScanCallbackStub::OnRemoteRequest( { WIFI_LOGD("WifiScanCallbackStub::OnRemoteRequest code:%{public}u!", code); if (mRemoteDied) { - WIFI_LOGD("Failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGE("Failed to `%{public}s`,remote service is died!", __func__); return -1; } @@ -44,7 +44,7 @@ int WifiScanCallbackStub::OnRemoteRequest( int exception = data.ReadInt32(); if (exception) { - WIFI_LOGD("WifiScanCallbackStub::OnRemoteRequest exception! %{public}d!", exception); + WIFI_LOGE("WifiScanCallbackStub::OnRemoteRequest exception! %{public}d!", exception); return WIFI_OPT_FAILED; } int ret = -1; @@ -64,7 +64,7 @@ int WifiScanCallbackStub::OnRemoteRequest( void WifiScanCallbackStub::RegisterCallBack(const sptr &userCallback) { if (userCallback_ != nullptr) { - WIFI_LOGD("Callback has registered!"); + WIFI_LOGE("Callback has registered!"); return; } userCallback_ = userCallback; @@ -82,7 +82,7 @@ void WifiScanCallbackStub::SetRemoteDied(bool val) void WifiScanCallbackStub::OnWifiScanStateChanged(int state) { - WIFI_LOGD("WifiScanCallbackStub::OnWifiScanStateChanged,state:%{public}d", state); + WIFI_LOGI("WifiScanCallbackStub::OnWifiScanStateChanged,state:%{public}d", state); if (userCallback_) { userCallback_->OnWifiScanStateChanged(state); diff --git a/wifi/frameworks/native/src/wifi_scan_proxy.cpp b/wifi/frameworks/native/src/wifi_scan_proxy.cpp index 7d73383e26c349a1942120ae6fe01d55fbf3daf0..ef2b5fd085bcfb32a1385f3b9665764a4e07e48f 100644 --- a/wifi/frameworks/native/src/wifi_scan_proxy.cpp +++ b/wifi/frameworks/native/src/wifi_scan_proxy.cpp @@ -51,7 +51,7 @@ WifiScanProxy::~WifiScanProxy() ErrCode WifiScanProxy::SetScanControlInfo(const ScanControlInfo &info) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -100,7 +100,7 @@ ErrCode WifiScanProxy::SetScanControlInfo(const ScanControlInfo &info) ErrCode WifiScanProxy::Scan() { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -132,7 +132,7 @@ ErrCode WifiScanProxy::Scan() ErrCode WifiScanProxy::AdvanceScan(const WifiScanParams ¶ms) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -172,7 +172,7 @@ ErrCode WifiScanProxy::AdvanceScan(const WifiScanParams ¶ms) ErrCode WifiScanProxy::IsWifiClosedScan(bool &bOpen) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -203,7 +203,7 @@ ErrCode WifiScanProxy::IsWifiClosedScan(bool &bOpen) ErrCode WifiScanProxy::GetScanInfoList(std::vector &result) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -273,7 +273,7 @@ ErrCode WifiScanProxy::GetScanInfoList(std::vector &result) ErrCode WifiScanProxy::RegisterCallBack(const sptr &callback) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } WIFI_LOGD("RegisterCallBack start!"); @@ -309,7 +309,7 @@ ErrCode WifiScanProxy::RegisterCallBack(const sptr &callback) ErrCode WifiScanProxy::GetSupportedFeatures(long &features) { if (mRemoteDied) { - WIFI_LOGD("failed to `%{public}s`,remote service is died!", __func__); + WIFI_LOGW("failed to `%{public}s`,remote service is died!", __func__); return WIFI_OPT_FAILED; } MessageOption option; @@ -339,7 +339,7 @@ ErrCode WifiScanProxy::GetSupportedFeatures(long &features) void WifiScanProxy::OnRemoteDied(const wptr& remoteObject) { - WIFI_LOGD("Remote service is died!"); + WIFI_LOGW("Remote service is died!"); mRemoteDied = true; if (g_wifiScanCallbackStub == nullptr) { WIFI_LOGE("g_wifiScanCallbackStub is nullptr!"); diff --git a/wifi/frameworks/native/src/wifi_scan_proxy_lite.cpp b/wifi/frameworks/native/src/wifi_scan_proxy_lite.cpp index 0553709575a78b971209e6f8e97cf86296ff4fa9..637565db291e65da6c76f55ecba0b3b4754cf59a 100644 --- a/wifi/frameworks/native/src/wifi_scan_proxy_lite.cpp +++ b/wifi/frameworks/native/src/wifi_scan_proxy_lite.cpp @@ -428,7 +428,7 @@ ErrCode WifiScanProxy::GetSupportedFeatures(long &features) void WifiScanProxy::OnRemoteDied(void) { - WIFI_LOGD("Remote service is died!"); + WIFI_LOGW("Remote service is died!"); remoteDied_ = true; g_wifiScanCallbackStub.SetRemoteDied(true); } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.cpp index 6fda7cccf3300a2b2363a6efade17aa32b66971b..75f7cd64470edb4c052001c43be6b26a25d8dd68 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.cpp @@ -112,13 +112,13 @@ ErrCode ApService::GetStationList(std::vector &result) const WIFI_LOGI("Instance %{public}d %{public}s", m_id, __func__); WifiSettings::GetInstance().GetStationList(result); if (result.empty()) { - WIFI_LOGD("GetStationList is empty."); + WIFI_LOGW("GetStationList is empty."); return ErrCode::WIFI_OPT_SUCCESS; } // get dhcp lease info, return full connected station info std::map tmp; if (!m_ApStateMachine.GetConnectedStationInfo(tmp)) { - WIFI_LOGD("Get connected station info failed!"); + WIFI_LOGW("Get connected station info failed!"); return ErrCode::WIFI_OPT_FAILED; } for (auto iter = result.begin(); iter != result.end(); ++iter) { diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_death_recipient.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_death_recipient.cpp index 15400dcb1342dd25483aa4874bc606b3b6b61859..d013552970b24d85d3095e5a99b79bddc7c87c86 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_death_recipient.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_death_recipient.cpp @@ -21,7 +21,7 @@ namespace OHOS { namespace Wifi { void WifiDeviceDeathRecipient::OnRemoteDied(const wptr& remoteObject) { - WIFI_LOGD("WifiDeviceDeathRecipient::OnRemoteDied!"); + WIFI_LOGW("WifiDeviceDeathRecipient::OnRemoteDied!"); WifiInternalEventDispatcher::GetInstance().RemoveStaCallback(remoteObject.promote()); } } // namespace Wifi diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp index 048d7c5c3c4ae25f7226b890928a5753523b7fc1..3b9f38f349554a832575c830a544e11983516057 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp @@ -1105,7 +1105,7 @@ bool WifiDeviceServiceImpl::IsStaServiceRunning() { WifiOprMidState curState = WifiConfigCenter::GetInstance().GetWifiMidState(); if (curState != WifiOprMidState::RUNNING) { - WIFI_LOGD("current wifi state is %{public}d", static_cast(curState)); + WIFI_LOGW("current wifi state is %{public}d", static_cast(curState)); return false; } return true; @@ -1115,7 +1115,7 @@ bool WifiDeviceServiceImpl::IsScanServiceRunning() { WifiOprMidState curState = WifiConfigCenter::GetInstance().GetScanMidState(); if (curState != WifiOprMidState::RUNNING) { - WIFI_LOGD("scan service does not started!"); + WIFI_LOGW("scan service does not started!"); return false; } return true; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp index 6f202e046461023756db39683f31dec7f2631bfe..56cdd72e4602bbee9af0b592b6e765a92aef5f58 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp @@ -561,13 +561,13 @@ void WifiDeviceStub::OnRegisterCallBack(uint32_t code, MessageParcel &data, Mess do { sptr remote = data.ReadRemoteObject(); if (remote == nullptr) { - WIFI_LOGD("Failed to ReadRemoteObject!"); + WIFI_LOGW("Failed to ReadRemoteObject!"); break; } callback_ = iface_cast(remote); if (callback_ == nullptr) { callback_ = new (std::nothrow) WifiDeviceCallBackProxy(remote); - WIFI_LOGD("create new WifiDeviceCallBackProxy!"); + WIFI_LOGI("create new WifiDeviceCallBackProxy!"); } if (mSingleCallback) { diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_death_recipient.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_death_recipient.cpp index f8de93325094c46a9fed09a9ceb1c02249fedadd..e24ef8f3a17f42d1aee653ecbf7264807b622708 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_death_recipient.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_death_recipient.cpp @@ -21,7 +21,7 @@ namespace OHOS { namespace Wifi { void WifiHotspotDeathRecipient::OnRemoteDied(const wptr& remoteObject) { - WIFI_LOGD("WifiHotspotDeathRecipient::OnRemoteDied!"); + WIFI_LOGI("WifiHotspotDeathRecipient::OnRemoteDied!"); WifiInternalEventDispatcher::GetInstance().RemoveHotspotCallback(remoteObject.promote()); } } // namespace Wifi diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_mgr_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_mgr_service_impl.cpp index d12d44668cb6b2e8294ecbbbd2d19b3fe99d992b..29cb1ad47c8322c3373c19933094d67dbc39490a 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_mgr_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_mgr_service_impl.cpp @@ -90,7 +90,7 @@ void SigHandler(int sig) void WifiHotspotMgrServiceImpl::OnStart() { if (mState == ServiceRunningState::STATE_RUNNING) { - WIFI_LOGD("Service has already started."); + WIFI_LOGW("Service has already started."); return; } if (!Init()) { diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.cpp index 2d0e2022aef6bdecdb0166524139c18c11e36f1f..3f89c2e16f0269b91a41933936716c0fffd1389f 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.cpp @@ -163,7 +163,7 @@ ErrCode WifiHotspotServiceImpl::SetHotspotConfig(const HotspotConfig &config) WifiConfigCenter::GetInstance().GetLinkedInfo(linkInfo); if (!linkInfo.ssid.empty() && linkInfo.ssid == config.GetSsid()) { - WIFI_LOGD("set ssid equal current linked ap ssid, no permission!"); + WIFI_LOGE("set ssid equal current linked ap ssid, no permission!"); return WIFI_OPT_INVALID_PARAM; } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_stub.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_stub.cpp index a725001a97ee1688eb823836aabaa0fc81b4c28e..26c5527a4e18bf7b8654b3051040672cd9f6fcd8 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_stub.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_stub.cpp @@ -75,7 +75,7 @@ int WifiHotspotStub::OnRemoteRequest(uint32_t code, MessageParcel &data, Message HandleFuncMap::iterator iter = handleFuncMap.find(code); if (iter == handleFuncMap.end()) { - WIFI_LOGD("not find function to deal, code %{public}u", code); + WIFI_LOGW("not find function to deal, code %{public}u", code); reply.WriteInt32(0); reply.WriteInt32(WIFI_OPT_NOT_SUPPORTED); } else { @@ -312,13 +312,13 @@ void WifiHotspotStub::OnRegisterCallBack( do { sptr remote = data.ReadRemoteObject(); if (remote == nullptr) { - WIFI_LOGD("Failed to ReadRemoteObject!"); + WIFI_LOGE("Failed to ReadRemoteObject!"); break; } sptr callback_ = iface_cast(remote); if (callback_ == nullptr) { callback_ = new (std::nothrow) WifiHotspotCallbackProxy(remote); - WIFI_LOGD("create new WifiHotspotCallbackProxy!"); + WIFI_LOGI("create new WifiHotspotCallbackProxy!"); } if (mSingleCallback) { diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp index 65c68f6647ff7139946e1c1437dd1291e111c9c1..88feb2824922ca89c85b73e323fc13775448f406 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp @@ -62,7 +62,7 @@ void WifiManager::AutoStartStaService(void) WifiOprMidState staState = WifiConfigCenter::GetInstance().GetWifiMidState(); if (staState == WifiOprMidState::CLOSED) { if (!WifiConfigCenter::GetInstance().SetWifiMidState(staState, WifiOprMidState::OPENING)) { - WIFI_LOGD("set sta mid state opening failed! may be other activity has been operated"); + WIFI_LOGW("set sta mid state opening failed! may be other activity has been operated"); return; } ErrCode errCode = WIFI_OPT_FAILED; @@ -153,7 +153,7 @@ void WifiManager::AutoStartP2pService(void) WifiOprMidState p2pState = WifiConfigCenter::GetInstance().GetP2pMidState(); if (p2pState == WifiOprMidState::CLOSED) { if (!WifiConfigCenter::GetInstance().SetP2pMidState(p2pState, WifiOprMidState::OPENING)) { - WIFI_LOGD("set p2p mid state opening failed!"); + WIFI_LOGW("set p2p mid state opening failed!"); return; } } @@ -190,13 +190,13 @@ void WifiManager::AutoStartP2pService(void) void WifiManager::AutoStartScanService(void) { if (!WifiConfigCenter::GetInstance().IsScanAlwaysActive()) { - WIFI_LOGD("Scan always is not open, not open scan service."); + WIFI_LOGW("Scan always is not open, not open scan service."); return; } ScanControlInfo info; WifiConfigCenter::GetInstance().GetScanControlInfo(info); if (!IsAllowScanAnyTime(info)) { - WIFI_LOGD("Scan control does not support scan always, not open scan service here."); + WIFI_LOGW("Scan control does not support scan always, not open scan service here."); return; } CheckAndStartScanService(); @@ -394,10 +394,10 @@ void WifiManager::DealCloseServiceMsg(WifiManager &manager) break; #endif case WifiCloseServiceCode::SERVICE_THREAD_EXIT: - WIFI_LOGD("DealCloseServiceMsg thread exit!"); + WIFI_LOGI("DealCloseServiceMsg thread exit!"); return; default: - WIFI_LOGD("Unknown message code, %{public}d", static_cast(msg)); + WIFI_LOGW("Unknown message code, %{public}d", static_cast(msg)); break; } } @@ -553,7 +553,7 @@ void WifiManager::CheckAndStartScanService(void) return; } if (!WifiConfigCenter::GetInstance().SetScanMidState(scanState, WifiOprMidState::OPENING)) { - WIFI_LOGD("Failed to set scan mid state opening! may be other activity has been operated"); + WIFI_LOGW("Failed to set scan mid state opening! may be other activity has been operated"); return; } ErrCode errCode = WIFI_OPT_FAILED; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/authorizing_negotiation_request_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/authorizing_negotiation_request_state.cpp index a94094962ffc924d90c6866e094f989e487404da..a38288687ec66ae90066d31fd4ca9463b3a3d826 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/authorizing_negotiation_request_state.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/authorizing_negotiation_request_state.cpp @@ -51,7 +51,7 @@ bool AuthorizingNegotiationRequestState::ExecuteStateMsg(InternalMessage *msg) if (wps.GetWpsMethod() == WpsMethod::WPS_METHOD_KEYPAD) { std::string inputPin; if (!msg->GetMessageObj(inputPin)) { - WIFI_LOGD("Failed to obtain the pin code."); + WIFI_LOGW("Failed to obtain the pin code."); break; } WpsInfo wpsPin = wps; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_formed_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_formed_state.cpp index 9f67976e3d1added1d05d014d1027945e0149583..a7eb003e9cbb1b10853266a2b376cc82ecd63cd7 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_formed_state.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_formed_state.cpp @@ -284,7 +284,7 @@ bool GroupFormedState::ProcessCmdDiscServices(const InternalMessage &msg) const return EXECUTED; } - WIFI_LOGD("CMD_DISCOVER_SERVICES successful."); + WIFI_LOGI("CMD_DISCOVER_SERVICES successful."); p2pStateMachine.BroadcastActionResult(P2pActionCallback::DiscoverServices, ErrCode::WIFI_OPT_SUCCESS); p2pStateMachine.BroadcastP2pDiscoveryChanged(true); return EXECUTED; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_negotiation_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_negotiation_state.cpp index 0268d23464486d2aae7f86623031dbd12925d1cd..6e5908ca294a3ddb255763d1a17686bbf760419a 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_negotiation_state.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_negotiation_state.cpp @@ -128,7 +128,7 @@ bool GroupNegotiationState::ProcessGroupStartedEvt(InternalMessage &msg) const p2pStateMachine.BroadcastP2pPeersChanged(); } else { - WIFI_LOGD("fail:No GO device information is found."); + WIFI_LOGE("fail:No GO device information is found."); } } SharedLinkManager::SetSharedLinkCount(SHARED_LINKE_COUNT_ON_CONNECTED); @@ -140,14 +140,14 @@ bool GroupNegotiationState::ProcessGroupStartedEvt(InternalMessage &msg) const bool GroupNegotiationState::ProcessGroupFormationFailEvt(InternalMessage &msg) const { int status = msg.GetParam1(); - WIFI_LOGD("Group formation failure. Error code: %{public}d", status); + WIFI_LOGW("Group formation failure. Error code: %{public}d", status); return EXECUTED; } bool GroupNegotiationState::ProcessNegotFailEvt(InternalMessage &msg) const { int status = msg.GetParam1(); - WIFI_LOGD("Negotiation failure. Error code: %{public}d", status); + WIFI_LOGE("Negotiation failure. Error code: %{public}d", status); p2pStateMachine.SwitchState(&p2pStateMachine.p2pIdleState); return EXECUTED; } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/invitation_received_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/invitation_received_state.cpp index 3c3169a9406f9f380cc8049836be7cca29379767..30b7a221c65fcd2e949bda39c667ffe8dcabeb80 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/invitation_received_state.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/invitation_received_state.cpp @@ -47,7 +47,7 @@ bool InvitationReceivedState::ExecuteStateMsg(InternalMessage *msg) if (wps.GetWpsMethod() == WpsMethod::WPS_METHOD_KEYPAD) { std::string inputPin; if (!msg->GetMessageObj(inputPin)) { - WIFI_LOGD("Failed to obtain the pin code."); + WIFI_LOGW("Failed to obtain the pin code."); break; } WpsInfo wpsPin = wps; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/invitation_request_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/invitation_request_state.cpp index 6fd74cb9835334b597a24119cc974c5a49fc98a0..1745fbc40114e972c2cedb17016daf0fac311a0f 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/invitation_request_state.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/invitation_request_state.cpp @@ -56,7 +56,7 @@ bool InvitationRequestState::ExecuteStateMsg(InternalMessage *msg) if (status == P2pStatus::UNKNOWN_P2P_GROUP) { int netId = groupManager.GetCurrentGroup().GetNetworkId(); if (netId >= 0) { - WIFI_LOGD("Remove unknown client from currentGroup"); + WIFI_LOGW("Remove unknown client from currentGroup"); p2pStateMachine.groupManager.RemoveClientFromGroup( netId, p2pStateMachine.savedP2pConfig.GetDeviceAddress()); p2pStateMachine.SwitchState(&p2pStateMachine.p2pGroupFormedState); @@ -68,7 +68,7 @@ bool InvitationRequestState::ExecuteStateMsg(InternalMessage *msg) if (status == P2pStatus::SUCCESS) { WIFI_LOGI("Invitation succeeded."); } else { - WIFI_LOGD("Invitation failed."); + WIFI_LOGW("Invitation failed."); } p2pStateMachine.SwitchState(&p2pStateMachine.p2pGroupFormedState); break; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_enabled_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_enabled_state.cpp index 43e832b95e892c165a3ab6764fbe1a256cc6424e..ba2ecacc59adf1cfe9c52aa7131e1f47547a40d9 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_enabled_state.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_enabled_state.cpp @@ -173,7 +173,7 @@ bool P2pEnabledState::ProcessCmdStopDiscPeer(InternalMessage &msg) const } bool P2pEnabledState::ProcessDeviceFoundEvt(InternalMessage &msg) const { - WIFI_LOGD("p2p_enabled_state recv P2P_EVENT_DEVICE_FOUND"); + WIFI_LOGI("p2p_enabled_state recv P2P_EVENT_DEVICE_FOUND"); WifiP2pDevice device; if (!msg.GetMessageObj(device)) { WIFI_LOGE("Failed to obtain device information."); @@ -189,7 +189,7 @@ bool P2pEnabledState::ProcessDeviceFoundEvt(InternalMessage &msg) const } bool P2pEnabledState::ProcessDeviceLostEvt(InternalMessage &msg) const { - WIFI_LOGD("p2p_enabled_state recv P2P_EVENT_DEVICE_LOST"); + WIFI_LOGI("p2p_enabled_state recv P2P_EVENT_DEVICE_LOST"); WifiP2pDevice device; if (!msg.GetMessageObj(device)) { WIFI_LOGE("Failed to obtain device information."); @@ -341,7 +341,7 @@ bool P2pEnabledState::P2pSettingsInitialization() bool P2pEnabledState::ProcessCmdAddLocalService(InternalMessage &msg) const { - WIFI_LOGD("p2p_enabled_state recv CMD_PUT_LOCAL_SERVICE"); + WIFI_LOGI("p2p_enabled_state recv CMD_PUT_LOCAL_SERVICE"); WifiP2pServiceInfo service; if (!msg.GetMessageObj(service)) { WIFI_LOGE("Failed to obtain WifiP2pServiceInfo information."); @@ -406,7 +406,7 @@ bool P2pEnabledState::ProcessCmdDiscServices(InternalMessage &msg) const return EXECUTED; } - WIFI_LOGD("CMD_DISCOVER_SERVICES successful."); + WIFI_LOGI("CMD_DISCOVER_SERVICES successful."); p2pStateMachine.BroadcastActionResult(P2pActionCallback::DiscoverServices, ErrCode::WIFI_OPT_SUCCESS); p2pStateMachine.BroadcastP2pDiscoveryChanged(true); return EXECUTED; @@ -459,7 +459,7 @@ bool P2pEnabledState::ProcessCmdRequestService(InternalMessage &msg) const bool P2pEnabledState::ProcessServiceDiscReqEvt(InternalMessage &msg) const { - WIFI_LOGD("p2p_enabled_state recv P2P_EVENT_SERV_DISC_REQ"); + WIFI_LOGI("p2p_enabled_state recv P2P_EVENT_SERV_DISC_REQ"); WifiP2pServiceRequestList reqList; if (!msg.GetMessageObj(reqList)) { WIFI_LOGE("Failed to obtain WifiP2pServiceRequestList information."); @@ -498,7 +498,7 @@ bool P2pEnabledState::ProcessServiceDiscReqEvt(InternalMessage &msg) const bool P2pEnabledState::ProcessServiceDiscRspEvt(InternalMessage &msg) const { - WIFI_LOGD("p2p_enabled_state recv P2P_EVENT_SERV_DISC_RESP"); + WIFI_LOGI("p2p_enabled_state recv P2P_EVENT_SERV_DISC_RESP"); WifiP2pServiceResponseList respList; if (!msg.GetMessageObj(respList)) { WIFI_LOGE("Failed to obtain WifiP2pServiceResponseList information."); @@ -522,7 +522,7 @@ bool P2pEnabledState::ProcessExceptionTimeOut(InternalMessage &msg) const bool P2pEnabledState::ProcessCmdSetDeviceName(InternalMessage &msg) const { - WIFI_LOGD("p2p_enabled_state CMD: set device name."); + WIFI_LOGI("p2p_enabled_state CMD: set device name."); std::string deviceName; if (!msg.GetMessageObj(deviceName)) { LOGE("Failed to obtain string information."); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_join_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_join_state.cpp index 81d44295cdb9b5453e49a10aeae0269658b9780f..17790cbdc2604217f85bd35f4642f459cf969466 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_join_state.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_join_state.cpp @@ -49,7 +49,7 @@ bool P2pGroupJoinState::ExecuteStateMsg(InternalMessage *msg) if (wps.GetWpsMethod() == WpsMethod::WPS_METHOD_KEYPAD) { std::string inputPin; if (!msg->GetMessageObj(inputPin)) { - WIFI_LOGD("Failed to obtain the pin code."); + WIFI_LOGW("Failed to obtain the pin code."); break; } WpsInfo wpsPin = wps; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_idle_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_idle_state.cpp index dd1ec3d070297c8a673064b371b953e6ca65a127..0e7daf6542922c4d6a92406c8d9693bc0a8005bc 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_idle_state.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_idle_state.cpp @@ -94,7 +94,7 @@ bool P2pIdleState::ProcessCmdConnect(InternalMessage &msg) const { WifiP2pConfigInternal config; if (!msg.GetMessageObj(config)) { - WIFI_LOGD("p2p connect Parameter error."); + WIFI_LOGW("p2p connect Parameter error."); p2pStateMachine.BroadcastActionResult(P2pActionCallback::P2pConnect, ErrCode::WIFI_OPT_INVALID_PARAM); return EXECUTED; } @@ -102,7 +102,7 @@ bool P2pIdleState::ProcessCmdConnect(InternalMessage &msg) const P2pConfigErrCode ret = p2pStateMachine.IsConfigUnusable(p2pStateMachine.savedP2pConfig); if (ret != P2pConfigErrCode::SUCCESS) { - WIFI_LOGD("Invalid device information."); + WIFI_LOGW("Invalid device information."); if (ret == P2pConfigErrCode::MAC_EMPTY) { p2pStateMachine.BroadcastActionResult(P2pActionCallback::P2pConnect, ErrCode::WIFI_OPT_INVALID_PARAM); } else if (ret == P2pConfigErrCode::MAC_NOT_FOUND) { @@ -175,7 +175,7 @@ bool P2pIdleState::ProcessNegotReqEvt(InternalMessage &msg) const { WifiP2pConfigInternal conf; if (!msg.GetMessageObj(conf)) { - WIFI_LOGD("Failed to obtain conf."); + WIFI_LOGW("Failed to obtain conf."); return EXECUTED; } p2pStateMachine.savedP2pConfig = conf; @@ -187,7 +187,7 @@ bool P2pIdleState::ProcessProvDiscShowPinEvt(InternalMessage &msg) const { WifiP2pTempDiscEvent provDisc; if (!msg.GetMessageObj(provDisc)) { - WIFI_LOGD("Failed to obtain provDisc."); + WIFI_LOGW("Failed to obtain provDisc."); return EXECUTED; } WifiP2pConfigInternal config; @@ -260,7 +260,7 @@ bool P2pIdleState::ProcessGroupStartedEvt(InternalMessage &msg) const p2pStateMachine.BroadcastP2pPeersChanged(); } else { - WIFI_LOGD("fail:No GO device information is found."); + WIFI_LOGW("fail:No GO device information is found."); } } else { WifiP2pGroupInfo currGrp = p2pStateMachine.groupManager.GetCurrentGroup(); @@ -284,7 +284,7 @@ bool P2pIdleState::ProcessInvitationReceivedEvt(InternalMessage &msg) const { WifiP2pGroupInfo group; if (!msg.GetMessageObj(group)) { - WIFI_LOGD("p2p invitation received: Parameter error."); + WIFI_LOGW("p2p invitation received: Parameter error."); return EXECUTED; } const WifiP2pDevice &owner = group.GetOwner(); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_monitor.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_monitor.cpp index c4c48e21205315ed2fb86610efc3c3564b5f8588..ebd720b1c3059b0c1d79c690fa9500531fa94f8b 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_monitor.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_monitor.cpp @@ -302,7 +302,7 @@ void P2pMonitor::OnConnectSupplicant(int status) const void P2pMonitor::WpaEventDeviceFound(const IdlP2pDeviceFound &deviceInfo) const { const int minWfdLength = 6; - WIFI_LOGD("onDeviceFound callback"); + WIFI_LOGI("onDeviceFound callback"); WifiP2pDevice device; device.SetDeviceName(deviceInfo.deviceName); if (device.GetDeviceName().empty()) { @@ -333,7 +333,7 @@ void P2pMonitor::WpaEventDeviceFound(const IdlP2pDeviceFound &deviceInfo) const void P2pMonitor::WpaEventDeviceLost(const std::string &p2pDeviceAddress) const { - WIFI_LOGD("onDeviceLost callback, p2pDeviceAddress:%{private}s", p2pDeviceAddress.c_str()); + WIFI_LOGI("onDeviceLost callback, p2pDeviceAddress:%{private}s", p2pDeviceAddress.c_str()); WifiP2pDevice device; device.SetDeviceAddress(p2pDeviceAddress); if (device.GetDeviceAddress().empty()) { @@ -347,7 +347,7 @@ void P2pMonitor::WpaEventDeviceLost(const std::string &p2pDeviceAddress) const void P2pMonitor::WpaEventGoNegRequest(const std::string &srcAddress, short passwordId) const { - WIFI_LOGD("WpaEventGoNegRequest srcAddress:%{private}s, passwordId:%{private}hd", srcAddress.c_str(), passwordId); + WIFI_LOGI("WpaEventGoNegRequest srcAddress:%{private}s, passwordId:%{private}hd", srcAddress.c_str(), passwordId); WifiP2pConfigInternal config; config.SetDeviceAddress(srcAddress); if (config.GetDeviceAddress().empty()) { @@ -380,20 +380,20 @@ void P2pMonitor::WpaEventGoNegRequest(const std::string &srcAddress, short passw void P2pMonitor::WpaEventGoNegSuccess(void) const { - WIFI_LOGD("onGoNegotiationSuccess callback"); + WIFI_LOGI("onGoNegotiationSuccess callback"); Broadcast2SmGoNegSuccess(selectIfacName); } void P2pMonitor::WpaEventGoNegFailure(int status) const { - WIFI_LOGD("onGoNegotiationFailure callback status:%{public}d", status); + WIFI_LOGI("onGoNegotiationFailure callback status:%{public}d", status); P2pStatus p2pStatus = IntStatusToP2pStatus(status); Broadcast2SmGoNegFailure(selectIfacName, p2pStatus); } void P2pMonitor::WpaEventInvitationReceived(const IdlP2pInvitationInfo &recvInfo) const { - WIFI_LOGD("onInvitationReceived callback"); + WIFI_LOGI("onInvitationReceived callback"); WifiP2pGroupInfo group; group.SetNetworkId(recvInfo.persistentNetworkId); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.cpp index 1521e80430b091d67491b16411ff48891df52513..e66ea45819c423eb56551c00cda8af98c7b74062 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.cpp @@ -60,7 +60,7 @@ WifiP2pServiceImpl::~WifiP2pServiceImpl() void WifiP2pServiceImpl::OnStart() { if (mState == ServiceRunningState::STATE_RUNNING) { - WIFI_LOGD("P2p service has already started."); + WIFI_LOGI("P2p service has already started."); return; } if (!Init()) { @@ -100,11 +100,11 @@ ErrCode WifiP2pServiceImpl::CheckCanEnableP2p(void) return WIFI_OPT_PERMISSION_DENIED; } if (WifiConfigCenter::GetInstance().GetAirplaneModeState() == 1) { - WIFI_LOGD("current airplane mode and can not use p2p, open failed!"); + WIFI_LOGW("current airplane mode and can not use p2p, open failed!"); return WIFI_OPT_FORBID_AIRPLANE; } if (WifiConfigCenter::GetInstance().GetPowerSavingModeState() == 1) { - WIFI_LOGD("current power saving mode and can not use p2p, open failed!"); + WIFI_LOGW("current power saving mode and can not use p2p, open failed!"); return WIFI_OPT_FORBID_POWSAVING; } return WIFI_OPT_SUCCESS; @@ -120,7 +120,7 @@ ErrCode WifiP2pServiceImpl::EnableP2p(void) WifiOprMidState curState = WifiConfigCenter::GetInstance().GetP2pMidState(); if (curState != WifiOprMidState::CLOSED) { - WIFI_LOGD("current p2p state is %{public}d", static_cast(curState)); + WIFI_LOGW("current p2p state is %{public}d", static_cast(curState)); if (curState == WifiOprMidState::CLOSING) { return WIFI_OPT_OPEN_FAIL_WHEN_CLOSING; } else { @@ -170,7 +170,7 @@ ErrCode WifiP2pServiceImpl::DisableP2p(void) WifiOprMidState curState = WifiConfigCenter::GetInstance().GetP2pMidState(); if (curState != WifiOprMidState::RUNNING) { - WIFI_LOGD("current p2p state is %{public}d", static_cast(curState)); + WIFI_LOGI("current p2p state is %{public}d", static_cast(curState)); if (curState == WifiOprMidState::OPENING) { return WIFI_OPT_CLOSE_FAIL_WHEN_OPENING; } else { @@ -728,7 +728,7 @@ bool WifiP2pServiceImpl::IsP2pServiceRunning() { WifiOprMidState curState = WifiConfigCenter::GetInstance().GetP2pMidState(); if (curState != WifiOprMidState::RUNNING) { - WIFI_LOGD("p2p service does not started!"); + WIFI_LOGW("p2p service does not started!"); return false; } return true; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.cpp index 4d0c7d6b89af40142340e441515e0ab5e795d5c9..264c56f1acd8fec646ad0e64ec839af575e4919f 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.cpp @@ -571,14 +571,14 @@ void WifiP2pStub::OnRegisterCallBack(uint32_t code, MessageParcel &data, Message do { sptr remote = data.ReadRemoteObject(); if (remote == nullptr) { - WIFI_LOGD("Failed to readRemoteObject!"); + WIFI_LOGE("Failed to readRemoteObject!"); break; } callback_ = iface_cast(remote); if (callback_ == nullptr) { callback_ = new (std::nothrow) WifiP2pCallbackProxy(remote); - WIFI_LOGD("create new `WifiP2pCallbackProxy`!"); + WIFI_LOGI("create new `WifiP2pCallbackProxy`!"); } if (mSingleCallback) { diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp index 738afabe6c4512e70e313969a7037f9a2aac5521..dc0d4267f538a34006d9b46ad6f0c067bdc5ccd4 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp @@ -902,7 +902,7 @@ void ScanService::HandleMovingFreezeChanged() movingFreezeBakup); /* Moving -> Freeze, set the scanned flag to false. */ if (!movingFreezeBakup && movingFreeze) { - WIFI_LOGD("set movingFreeze scanned false."); + WIFI_LOGW("set movingFreeze scanned false."); SetMovingFreezeScaned(false); } } @@ -913,7 +913,7 @@ void ScanService::HandleCustomStatusChanged(int customScene, int customSceneStat WIFI_LOGD("sizeof(time_t):%{public}d", int(sizeof(time_t))); time_t now = time(nullptr); - WIFI_LOGD("customScene:%{public}d, status:%{public}d", customScene, customSceneStatus); + WIFI_LOGI("customScene:%{public}d, status:%{public}d", customScene, customSceneStatus); if (customSceneStatus == MODE_STATE_OPEN) { customSceneTimeMap.insert(std::pair(customScene, now)); } @@ -933,16 +933,11 @@ void ScanService::HandleGetCustomSceneState(std::map& sceneMap) con void ScanService::SystemScanProcess(bool scanAtOnce) { - WIFI_LOGI("Enter ScanService::SystemScanProcess."); + WIFI_LOGI("Enter ScanService::SystemScanProcess, scanAtOnce:%{public}d.", scanAtOnce); StopSystemScan(); int state = WifiSettings::GetInstance().GetScreenState(); - if (state == MODE_STATE_OPEN) { - WIFI_LOGD("Screen is on."); - } else { - WIFI_LOGD("ScreenOn is off."); - } - + WIFI_LOGI("Screen state(1:OPEN, 2:CLOSE): %{public}d.", state); if (state == MODE_STATE_OPEN) { { std::unique_lock lock(scanControlInfoMutex); @@ -1021,7 +1016,7 @@ void ScanService::StartSystemTimerScan(bool scanAtOnce) } else { scanTime = systemScanIntervalMode.scanIntervalMode.interval - sinceLastScan; } - WIFI_LOGD("scanTime: %{public}d, interval:%{public}d, count:%{public}d", + WIFI_LOGI("scanTime: %{public}d, interval:%{public}d, count:%{public}d", scanTime, systemScanIntervalMode.scanIntervalMode.interval, systemScanIntervalMode.scanIntervalMode.count); @@ -1151,12 +1146,12 @@ ErrCode ScanService::AllowSystemTimerScan() } if (!AllowScanDuringStaScene(staScene, ScanMode::SYSTEM_TIMER_SCAN)) { - WIFI_LOGD("system timer scan not allowed, staScene is %{public}d", staScene); + WIFI_LOGW("system timer scan not allowed, staScene is %{public}d", staScene); return WIFI_OPT_FAILED; } if (!AllowScanDuringCustomScene(ScanMode::SYSTEM_TIMER_SCAN)) { - WIFI_LOGD("system timer scan not allowed"); + WIFI_LOGW("system timer scan not allowed"); return WIFI_OPT_FAILED; } @@ -1183,7 +1178,7 @@ ErrCode ScanService::AllowSystemTimerScan() return WIFI_OPT_FAILED; } - WIFI_LOGD("allow system timer scan"); + WIFI_LOGI("allow system timer scan"); return WIFI_OPT_SUCCESS; } @@ -1192,15 +1187,17 @@ ErrCode ScanService::AllowPnoScan() WIFI_LOGI("Enter ScanService::AllowPnoScan.\n"); if (staStatus != static_cast(OperateResState::DISCONNECT_DISCONNECTED)) { + WIFI_LOGE("NOT allow PNO scan for staStatus: %{public}d", staStatus); return WIFI_OPT_FAILED; } int staScene = GetStaScene(); if (staScene == SCAN_SCENE_MAX) { + WIFI_LOGE("NOT allow PNO scan for staScene: %{public}d", staScene); return WIFI_OPT_FAILED; } if (!AllowScanDuringStaScene(staScene, ScanMode::PNO_SCAN)) { - WIFI_LOGD("pnoScan is not allowed for forbid map, staScene is %{public}d", staScene); + WIFI_LOGW("pnoScan is not allowed for forbid map, staScene is %{public}d", staScene); return WIFI_OPT_FAILED; } if (!AllowScanDuringCustomScene(ScanMode::PNO_SCAN)) { @@ -1221,7 +1218,7 @@ ErrCode ScanService::AllowPnoScan() pnoScanIntervalMode.scanIntervalMode.count = iter->count; if (!PnoScanByInterval(pnoScanIntervalMode.fixedScanCount, pnoScanIntervalMode.fixedCurrentTime, pnoScanIntervalMode.scanIntervalMode.interval, pnoScanIntervalMode.scanIntervalMode.count)) { - WIFI_LOGD("pnoScan is not allowed for interval mode"); + WIFI_LOGW("pnoScan is not allowed for interval mode"); return WIFI_OPT_FAILED; } } @@ -1229,11 +1226,11 @@ ErrCode ScanService::AllowPnoScan() } if (!AllowScanByDisableScanCtrl()) { - WIFI_LOGD("extern scan not allow by disable scan control."); + WIFI_LOGW("extern scan not allow by disable scan control."); return WIFI_OPT_FAILED; } - WIFI_LOGD("pno scan is allowed"); + WIFI_LOGI("pno scan is allowed"); return WIFI_OPT_SUCCESS; } @@ -1333,7 +1330,7 @@ ErrCode ScanService::ApplyTrustListPolicy(ScanType scanType) SetScanTrustMode(); policyResult = AllowScanByType(scanType); if (policyResult != WIFI_OPT_SUCCESS) { - WIFI_LOGD("AllowScanByType failed."); + WIFI_LOGW("AllowScanByType failed."); } ResetToNonTrustMode(); WIFI_LOGI("apply trust list policy, ErrCode=%{public}d", static_cast(policyResult)); @@ -1727,7 +1724,7 @@ bool ScanService::AllowScanDuringScanning(ScanMode scanMode) const std::unique_lock lock(scanControlInfoMutex); for (auto iter = scanControlInfo.scanForbidList.begin(); iter != scanControlInfo.scanForbidList.end(); ++iter) { if (iter->scanScene == SCAN_SCENE_SCANNING && iter->scanMode == scanMode) { - WIFI_LOGD("scan not allow by scanning scene."); + WIFI_LOGW("scan not allow by scanning scene."); return false; } } @@ -1741,14 +1738,14 @@ bool ScanService::AllowScanDuringScreenOff(ScanMode scanMode) const bool isTrustListMode = IsScanTrustMode(); bool isInList = IsInScanTrust(SCAN_SCENE_SCREEN_OFF); if (isTrustListMode && isInList) { - WIFI_LOGD("Trust list mode,sceneId(SCAN_SCENE_SCREEN_OFF) in the list,return true."); + WIFI_LOGI("Trust list mode,sceneId(SCAN_SCENE_SCREEN_OFF) in the list,return true."); return true; } std::unique_lock lock(scanControlInfoMutex); for (auto iter = scanControlInfo.scanForbidList.begin(); iter != scanControlInfo.scanForbidList.end(); ++iter) { if (iter->scanScene == SCAN_SCENE_SCREEN_OFF && iter->scanMode == scanMode) { - WIFI_LOGD("scan not allow by screen off scene."); + WIFI_LOGW("scan not allow by screen off scene."); return false; } } @@ -1766,7 +1763,7 @@ bool ScanService::AllowScanDuringStaScene(int staScene, ScanMode scanMode) } std::unique_lock lock(scanControlInfoMutex); for (auto iter = scanControlInfo.scanForbidList.begin(); iter != scanControlInfo.scanForbidList.end(); ++iter) { - WIFI_LOGD("now - staCurrentTime:%{public}d, iter->forbidTime:%{public}d", int(now - staCurrentTime), + WIFI_LOGI("now - staCurrentTime:%{public}d, iter->forbidTime:%{public}d", int(now - staCurrentTime), iter->forbidTime); /* forbid scan mode found in scan scene. */ if (iter->scanScene == staScene && iter->scanMode == scanMode) { @@ -1817,17 +1814,21 @@ bool ScanService::AllowCustomSceneCheck(const std::map::const_itera if (iter->scanScene == customIter->first && iter->scanMode == scanMode) { /* forbidCount=0 and forbidTime=0, directly forbid scan. */ if ((iter->forbidTime == 0) && (iter->forbidCount == 0)) { - WIFI_LOGD("Scan is forbidden by staScene."); + WIFI_LOGW("Scan is forbidden by staScene."); return false; } /* Unconditional scan control for forbidCount times. */ if (iter->forbidCount > 0 && iter->forbidCount - customSceneForbidCount > 0) { customSceneForbidCount++; + WIFI_LOGW("Unconditional scan control for forbidCount times, customSceneForbidCount:%{public}d.", + customSceneForbidCount); return false; } /* Scan interval less than forbidTime, forbid scan. */ time_t now = time(nullptr); if (iter->forbidTime > 0 && iter->forbidTime > now - customIter->second) { + WIFI_LOGW("Scan interval less than forbidTime, forbid scan, forbidTime:%{public}d.", + iter->forbidTime); return false; } } @@ -2136,13 +2137,13 @@ bool ScanService::AllowScanByIntervalBlocklist( } /* If the app ID is in the blocklist, extern scan is forbidden. */ if (std::find(scanBlocklist.begin(), scanBlocklist.end(), appId) != scanBlocklist.end()) { - WIFI_LOGD("extern scan not allowed by blocklist"); + WIFI_LOGW("extern scan not allowed by blocklist"); return false; } /* First scan */ if (blockListScanTime == 0) { blockListScanTime = now; - WIFI_LOGD("blockListScanTime, first scan."); + WIFI_LOGW("blockListScanTime, first scan."); return true; } /** @@ -2161,7 +2162,7 @@ bool ScanService::AllowScanByIntervalBlocklist( * is greater than count, the user is blocklisted forbidding scanning. */ scanBlocklist.push_back(appId); - WIFI_LOGD("scanBlocklist.push_back(appId), return false."); + WIFI_LOGI("scanBlocklist.push_back(appId), return false."); return false; } blockListScanTime = now; @@ -2195,7 +2196,7 @@ bool ScanService::AllowScanByMovingFreeze() WIFI_LOGD("In movingfreeze mode, return true for the first scan."); return true; } else { - WIFI_LOGD("In movingfreeze mode, return false for the already scanned."); + WIFI_LOGW("In movingfreeze mode, return false for the already scanned."); return false; } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_service_impl.cpp index 2954dd164c6e26ba7a8d76feb746e2d8fd45469e..e77caddb5d2c8c7791bab41e19efeef23cec0d64 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_service_impl.cpp @@ -76,7 +76,7 @@ WifiScanServiceImpl::~WifiScanServiceImpl() void WifiScanServiceImpl::OnStart() { if (mState == ServiceRunningState::STATE_RUNNING) { - WIFI_LOGD("Service has already started."); + WIFI_LOGW("Service has already started."); return; } if (!Init()) { @@ -256,7 +256,7 @@ bool WifiScanServiceImpl::IsScanServiceRunning() { WifiOprMidState curState = WifiConfigCenter::GetInstance().GetScanMidState(); if (curState != WifiOprMidState::RUNNING) { - WIFI_LOGD("scan service does not started!"); + WIFI_LOGW("scan service does not started!"); return false; } return true; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_stub.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_stub.cpp index 585cd951d59934f16597e4083a1a2667fa089e3c..d3645682954ba95825a5d02a19744b2990b7f3bd 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_stub.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_stub.cpp @@ -225,14 +225,14 @@ int WifiScanStub::OnRegisterCallBack(uint32_t code, MessageParcel &data, Message do { sptr remote = data.ReadRemoteObject(); if (remote == nullptr) { - WIFI_LOGD("Failed to readRemoteObject!"); + WIFI_LOGE("Failed to readRemoteObject!"); break; } callback_ = iface_cast(remote); if (callback_ == nullptr) { callback_ = new (std::nothrow) WifiScanCallbackProxy(remote); - WIFI_LOGD("create new `WifiScanCallbackProxy`!"); + WIFI_LOGI("create new `WifiScanCallbackProxy`!"); } if (mSingleCallback) { diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_stub_lite.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_stub_lite.cpp index bc5f1df482dc0a6a611d8aad77a63fe32383203b..1afb2b058438338c5925ac7405686795e4ab7549 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_stub_lite.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_stub_lite.cpp @@ -35,7 +35,7 @@ int WifiScanStub::OnRemoteRequest(uint32_t code, IpcIo *req, IpcIo *reply) { WIFI_LOGD("WifiScanStub::OnRemoteRequest,code:%{public}u", code); if (req == nullptr || reply == nullptr) { - WIFI_LOGD("req:%{public}d, reply:%{public}d", req == nullptr, reply == nullptr); + WIFI_LOGE("req:%{public}d, reply:%{public}d", req == nullptr, reply == nullptr); return ERR_FAILED; } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_service_manager.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_service_manager.cpp index 8dfb0eba610d74653f34864945ea1724f93c6ca1..be8aa6cfcf3f8f1b692b95cb64d81a40f314acfa 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_service_manager.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_service_manager.cpp @@ -376,7 +376,7 @@ int WifiServiceManager::UnloadP2pService(bool bPreLoad) int WifiServiceManager::UnloadService(const std::string &name, int id) { bool bPreLoad = WifiSettings::GetInstance().IsModulePreLoad(name); - WIFI_LOGD("WifiServiceManager::UnloadService name: %{public}s", name.c_str()); + WIFI_LOGI("WifiServiceManager::UnloadService name: %{public}s", name.c_str()); std::unique_lock lock(mMutex); if (name == WIFI_SERVICE_STA) { return UnloadStaService(bPreLoad); @@ -399,7 +399,7 @@ int WifiServiceManager::UnloadService(const std::string &name, int id) void WifiServiceManager::UninstallAllService() { - WIFI_LOGD("WifiServiceManager::UninstallAllService"); + WIFI_LOGI("WifiServiceManager::UninstallAllService"); UnloadStaService(false); UnloadScanService(false); #ifdef FEATURE_AP_SUPPORT diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.cpp index b5f92be5f3f35f57b1412f071bf5e4afdaf706a0..4e7a96912059a9c678afe57e7863f841d2149736 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.cpp @@ -46,7 +46,7 @@ extern "C" void Destroy(IStaService *pservice) ErrCode StaInterface::EnableWifi() { - WIFI_LOGD("Enter StaInterface::EnableWifi.\n"); + WIFI_LOGI("Enter StaInterface::EnableWifi.\n"); if(pStaService == nullptr) { pStaService = new (std::nothrow) StaService(); if (pStaService == nullptr) { @@ -205,7 +205,7 @@ ErrCode StaInterface::RemoveAllDevice() WIFI_LOGD("Enter StaInterface::RemoveAllDevice.\n"); CHECK_NULL_AND_RETURN(pStaService, WIFI_OPT_FAILED); if (pStaService->RemoveAllDevice() != WIFI_OPT_SUCCESS) { - WIFI_LOGD("RemoveAllDevice failed.\n"); + WIFI_LOGW("RemoveAllDevice failed.\n"); return WIFI_OPT_FAILED; } return WIFI_OPT_SUCCESS; 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 d0efb8d267f2b09cd4962e46f376556dda73e8bb..40ce71346c8b403f4a46d4a0c94a18a1c2b3f26a 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 @@ -310,7 +310,7 @@ ErrCode StaService::ReAssociate() const ErrCode StaService::EnableDeviceConfig(int networkId, bool attemptEnable) const { - WIFI_LOGD("Enter StaService::EnableDeviceConfig! networkid is %{public}d", networkId); + WIFI_LOGI("Enter StaService::EnableDeviceConfig! networkid is %{public}d", networkId); /* Update wifi status. */ if (WifiSettings::GetInstance().SetDeviceState(networkId, (int)WifiDeviceConfigStatus::ENABLED, attemptEnable) < @@ -324,7 +324,7 @@ ErrCode StaService::EnableDeviceConfig(int networkId, bool attemptEnable) const ErrCode StaService::DisableDeviceConfig(int networkId) const { - WIFI_LOGD("Enter StaService::DisableDeviceConfig.networkid is %{public}d", networkId); + WIFI_LOGI("Enter StaService::DisableDeviceConfig.networkid is %{public}d", networkId); if (WifiSettings::GetInstance().SetDeviceState(networkId, (int)WifiDeviceConfigStatus::DISABLED) < 0) { WIFI_LOGE("Disable device config failed!"); 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 61ad37020f5c873702fdf45eebb948721fe04e47..1266871478ee03ce7dfd2a6c229e9781de9042d7 100644 --- 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 @@ -562,7 +562,7 @@ void StaStateMachine::StopWifiProcess() /* Callback result to InterfaceService. */ WifiSettings::GetInstance().SetWifiState(static_cast(WifiState::DISABLED)); staCallback.OnStaCloseRes(OperateResState::CLOSE_WIFI_SUCCEED); - WIFI_LOGD("Stop WifiProcess successfully!"); + WIFI_LOGI("Stop WifiProcess successfully!"); /* The current state of StaStateMachine transfers to InitState. */ SwitchState(pInitState); @@ -951,7 +951,7 @@ void StaStateMachine::DealReConnectCmd(InternalMessage *msg) } if (WifiStaHalInterface::GetInstance().Reconnect() == WIFI_IDL_OPT_OK) { - WIFI_LOGD("StaStateMachine ReConnect successfully!"); + WIFI_LOGI("StaStateMachine ReConnect successfully!"); /* Callback result to InterfaceService */ staCallback.OnStaConnChanged(OperateResState::CONNECT_CONNECTING, linkedInfo); StopTimer(static_cast(CMD_NETWORK_CONNECT_TIMEOUT)); @@ -993,7 +993,7 @@ void StaStateMachine::DealStartWpsCmd(InternalMessage *msg) StartWpsMode(msg); if ((wpsState == SetupMethod::DISPLAY) || (wpsState == SetupMethod::KEYPAD)) { - WIFI_LOGD("Clear WPA block list every ten second!"); + WIFI_LOGW("Clear WPA block list every ten second!"); SendMessage(WPA_BLOCK_LIST_CLEAR_EVENT); } }