From 4d19eb3e43742f91797f1aebc16edcdd86267b0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=B1=9F=E5=BD=A4?= <1332187805@qq.com> Date: Thu, 4 Sep 2025 19:56:35 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=80=BB=E8=BE=91=20Sign?= =?UTF-8?q?ed-off-by:=20=E6=9D=8E=E6=B1=9F=E5=BD=A4=20<1332187805@qq.com>?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- services/network_search/src/device_state_handler.cpp | 6 +++++- services/network_search/src/network_search_manager.cpp | 3 ++- .../core_service_gtest/network_search_branch_test.cpp | 6 ++++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/services/network_search/src/device_state_handler.cpp b/services/network_search/src/device_state_handler.cpp index e3c7d8ced..d516e8cef 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 5990f6ea5..9eb852fcd 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 e7b13b9d6..3611cf386 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 -- Gitee From 4e69314503eeb1f7b797251eaa8e509d63e4057a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=B1=9F=E5=BD=A4?= <1332187805@qq.com> Date: Thu, 4 Sep 2025 19:56:35 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=80=BB=E8=BE=91=20Sign?= =?UTF-8?q?ed-off-by:=20=E6=9D=8E=E6=B1=9F=E5=BD=A4=20<1332187805@qq.com>?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- services/network_search/include/device_state_handler.h | 3 ++- services/network_search/src/device_state_handler.cpp | 6 +++++- services/network_search/src/network_search_manager.cpp | 3 ++- .../core_service_gtest/network_search_branch_test.cpp | 6 ++++-- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/services/network_search/include/device_state_handler.h b/services/network_search/include/device_state_handler.h index bac28e8b0..8280c5b94 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 e3c7d8ced..d516e8cef 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 5990f6ea5..9eb852fcd 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 e7b13b9d6..3611cf386 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 -- Gitee