diff --git a/services/network_search/include/device_state_handler.h b/services/network_search/include/device_state_handler.h index bac28e8b04107b9fd6012bfe0c839917eaa79fbb..8280c5b94216174fe768799c4506b4bfd82dd95f 100644 --- a/services/network_search/include/device_state_handler.h +++ b/services/network_search/include/device_state_handler.h @@ -35,7 +35,8 @@ public: void ProcessNetSharingState(bool isNetSharingOn); void ProcessRadioState(); void ProcessShutDown(); - void UpdateDeviceState(bool isEnterStrMode); + void UpdateDeviceState(); + void SetIsEnterStrMode(bool isEnterStrMode); private: uint32_t GetCellRequestMinInterval() const; diff --git a/services/network_search/src/device_state_handler.cpp b/services/network_search/src/device_state_handler.cpp index e3c7d8ced17d92ae4ce391aef25bda5e3da4713d..d516e8cefa5909d41c4a292a5a6a90756c66d5fd 100644 --- a/services/network_search/src/device_state_handler.cpp +++ b/services/network_search/src/device_state_handler.cpp @@ -96,9 +96,13 @@ void DeviceStateHandler::ProcessShutDown() nsm->SetRadioState(slotId_, false, 0); } -void DeviceStateHandler::UpdateDeviceState(bool isEnterStrMode) +void DeviceStateHandler::SetIsEnterStrMode(bool isEnterStrMode) { isEnterStrMode_ = isEnterStrMode; +} + +void DeviceStateHandler::UpdateDeviceState() +{ ProcessDeviceState(); } diff --git a/services/network_search/src/network_search_manager.cpp b/services/network_search/src/network_search_manager.cpp index 5990f6ea56472d9a919334d8192f1d439de42854..9eb852fcdcd9b80173f28fda05eff6191002cf8a 100644 --- a/services/network_search/src/network_search_manager.cpp +++ b/services/network_search/src/network_search_manager.cpp @@ -2065,7 +2065,8 @@ void NetworkSearchManager::UpdateDeviceState(int32_t slotId, bool isEnterStrMode inner->networkSearchHandler_->RadioOnState(); } if (inner->deviceStateHandler_ != nullptr) { - inner->deviceStateHandler_->UpdateDeviceState(isEnterStrMode); + inner->deviceStateHandler_->SetIsEnterStrMode(isEnterStrMode); + inner->deviceStateHandler_->UpdateDeviceState(); } } } // namespace Telephony diff --git a/test/unittest/core_service_gtest/network_search_branch_test.cpp b/test/unittest/core_service_gtest/network_search_branch_test.cpp index e7b13b9d64dbab499fac10efed5c7bb411a0c293..3611cf3861926a4d95c468260dd6828801c48852 100644 --- a/test/unittest/core_service_gtest/network_search_branch_test.cpp +++ b/test/unittest/core_service_gtest/network_search_branch_test.cpp @@ -393,9 +393,11 @@ HWTEST_F(NetworkSearchBranchTest, Telephony_NetworkSearchState_003, TestSize.Lev std::weak_ptr weakTelRilManager = telRilManager; std::weak_ptr weakNetworkSearchManager = networkSearchManager; auto deviceStateHandler = std::make_shared(weakNetworkSearchManager, weakTelRilManager, 0); - deviceStateHandler->UpdateDeviceState(true); + deviceStateHandler->SetIsEnterStrMode(true); + deviceStateHandler->UpdateDeviceState(); EXPECT_EQ(deviceStateHandler->isEnterStrMode_, true); - deviceStateHandler->UpdateDeviceState(false); + deviceStateHandler->SetIsEnterStrMode(false); + deviceStateHandler->UpdateDeviceState(); EXPECT_EQ(deviceStateHandler->isEnterStrMode_, false); } } // namespace Telephony