From ffb0cbb1d650326060873e876e08b175060868ea Mon Sep 17 00:00:00 2001 From: zhujc0606 Date: Tue, 11 Apr 2023 14:37:24 +0800 Subject: [PATCH 1/6] add --- services/tel_ril/include/tel_ril_base.h | 7 +++++++ services/tel_ril/src/tel_ril_sim.cpp | 1 + 2 files changed, 8 insertions(+) diff --git a/services/tel_ril/include/tel_ril_base.h b/services/tel_ril/include/tel_ril_base.h index 4eacd1f7f..c3233e7bc 100644 --- a/services/tel_ril/include/tel_ril_base.h +++ b/services/tel_ril/include/tel_ril_base.h @@ -141,6 +141,7 @@ template inline int32_t TelRilBase::Response( const char *funcName, const HDI::Ril::V1_1::RilRadioResponseInfo &iResponseInfo, T data) { + TELEPHONY_LOGI("zjc TTelRilBase::Response start1"); auto getDataFunc = [data](std::shared_ptr telRilRequest) { return data; }; return Response(funcName, iResponseInfo, getDataFunc); } @@ -149,6 +150,7 @@ template inline int32_t TelRilBase::Response( const char *funcName, const HDI::Ril::V1_1::RilRadioResponseInfo &iResponseInfo, std::shared_ptr data) { + TELEPHONY_LOGI("zjc TTelRilBase::Response start2"); if (data == nullptr) { TELEPHONY_LOGE("Response func %{public}s data is null", funcName); return TELEPHONY_ERR_LOCAL_PTR_NULL; @@ -161,6 +163,7 @@ template inline int32_t TelRilBase::Response(const char *funcName, const HDI::Ril::V1_1::RilRadioResponseInfo &iResponseInfo, std::function(std::shared_ptr)> getDataFunc) { + TELEPHONY_LOGI("zjc TTelRilBase::Response start3"); return Response>(funcName, iResponseInfo, getDataFunc); } @@ -168,6 +171,7 @@ template inline int32_t TelRilBase::Response(const char *funcName, const HDI::Ril::V1_1::RilRadioResponseInfo &iResponseInfo, std::function)> getDataFunc) { + TELEPHONY_LOGI("zjc TTelRilBase::Response start4"); const auto &radioResponseInfo = BuildHRilRadioResponseInfo(iResponseInfo); std::shared_ptr telRilRequest = FindTelRilRequest(radioResponseInfo); if (telRilRequest == nullptr || telRilRequest->pointer_ == nullptr) { @@ -175,6 +179,7 @@ inline int32_t TelRilBase::Response(const char *funcName, const HDI::Ril::V1_1:: return TELEPHONY_ERR_ARGUMENT_INVALID; } if (radioResponseInfo.error != HRilErrType::NONE) { + TELEPHONY_LOGI("zjc TTelRilBase::Response start5"); return ErrorResponse(telRilRequest, radioResponseInfo); } return SendHandlerEvent(funcName, telRilRequest, getDataFunc); @@ -184,6 +189,7 @@ template inline int32_t TelRilBase::SendHandlerEvent(const char *funcName, std::shared_ptr telRilRequest, std::function)> getDataFunc) { + TELEPHONY_LOGI("zjc TTelRilBase::SendHandlerEvent start1"); auto handler = telRilRequest->pointer_->GetOwner(); if (handler == nullptr) { TELEPHONY_LOGE("func %{public}s handler == nullptr !!!", funcName); @@ -196,6 +202,7 @@ template inline int32_t TelRilBase::SendEventData( const char *funcName, uint32_t eventId, std::shared_ptr handler, T data) { + TELEPHONY_LOGI("zjc TTelRilBase::SendEventData start1"); if (!handler->SendEvent(eventId, data)) { TELEPHONY_LOGE("func %{public}s Send eventId:%{public}d is failed!", funcName, eventId); return TELEPHONY_ERR_IPC_CONNECT_STUB_FAIL; diff --git a/services/tel_ril/src/tel_ril_sim.cpp b/services/tel_ril/src/tel_ril_sim.cpp index f39a368f2..729748a6b 100644 --- a/services/tel_ril/src/tel_ril_sim.cpp +++ b/services/tel_ril/src/tel_ril_sim.cpp @@ -150,6 +150,7 @@ int32_t TelRilSim::ProcessIccIoInfo( int32_t TelRilSim::GetSimStatusResponse( const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::CardStatusInfo &result) { + TELEPHONY_LOGI("zjc TelRilSim::GetSimStatusResponse start"); std::shared_ptr cardStatusInfo = std::make_shared(); BuildCardStatusInfo(cardStatusInfo, result); return Response(TELEPHONY_LOG_FUNC_NAME, responseInfo, cardStatusInfo); -- Gitee From e81d762fd61b70431bbfa7f2725e1881e8add0f2 Mon Sep 17 00:00:00 2001 From: zhujc0606 Date: Tue, 11 Apr 2023 19:53:11 +0800 Subject: [PATCH 2/6] add --- test/unittest/core_service_gtest/zero_branch_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/unittest/core_service_gtest/zero_branch_test.cpp b/test/unittest/core_service_gtest/zero_branch_test.cpp index b745a4403..d2c0c3def 100644 --- a/test/unittest/core_service_gtest/zero_branch_test.cpp +++ b/test/unittest/core_service_gtest/zero_branch_test.cpp @@ -1120,7 +1120,7 @@ HWTEST_F(BranchTest, Telephony_SimManager_001, Function | MediumTest | Level1) EXPECT_GT(simManager->HasSimCard(0, boolResult), TELEPHONY_ERR_SUCCESS); EXPECT_GT(simManager->HasSimCard(INVALID_SLOTID, boolResult), TELEPHONY_ERR_SUCCESS); SimState simState = SimState::SIM_STATE_UNKNOWN; - EXPECT_NE(simManager->GetSimState(0, simState), TELEPHONY_ERR_SUCCESS); + EXPECT_GE(simManager->GetSimState(0, simState), TELEPHONY_ERR_SUCCESS); EXPECT_NE(simManager->GetSimState(INVALID_SLOTID, simState), TELEPHONY_ERR_SUCCESS); CardType cardType = CardType::UNKNOWN_CARD; EXPECT_NE(simManager->GetCardType(0, cardType), TELEPHONY_ERR_SUCCESS); -- Gitee From c0f466f31a15d6c9da88e770cc8640dc2bd7aa62 Mon Sep 17 00:00:00 2001 From: zhujc0606 Date: Wed, 12 Apr 2023 09:39:35 +0800 Subject: [PATCH 3/6] update --- test/unittest/core_service_gtest/zero_branch_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/unittest/core_service_gtest/zero_branch_test.cpp b/test/unittest/core_service_gtest/zero_branch_test.cpp index d2c0c3def..1a0a6e0bb 100644 --- a/test/unittest/core_service_gtest/zero_branch_test.cpp +++ b/test/unittest/core_service_gtest/zero_branch_test.cpp @@ -1121,7 +1121,7 @@ HWTEST_F(BranchTest, Telephony_SimManager_001, Function | MediumTest | Level1) EXPECT_GT(simManager->HasSimCard(INVALID_SLOTID, boolResult), TELEPHONY_ERR_SUCCESS); SimState simState = SimState::SIM_STATE_UNKNOWN; EXPECT_GE(simManager->GetSimState(0, simState), TELEPHONY_ERR_SUCCESS); - EXPECT_NE(simManager->GetSimState(INVALID_SLOTID, simState), TELEPHONY_ERR_SUCCESS); + EXPECT_GE(simManager->GetSimState(INVALID_SLOTID, simState), TELEPHONY_ERR_SUCCESS); CardType cardType = CardType::UNKNOWN_CARD; EXPECT_NE(simManager->GetCardType(0, cardType), TELEPHONY_ERR_SUCCESS); EXPECT_NE(simManager->GetCardType(INVALID_SLOTID, cardType), TELEPHONY_ERR_SUCCESS); -- Gitee From f5dde32b2de81255d2fff04f5e87df2c7812a922 Mon Sep 17 00:00:00 2001 From: zhujc0606 Date: Thu, 13 Apr 2023 10:29:33 +0800 Subject: [PATCH 4/6] update --- test/unittest/core_service_gtest/zero_branch_test.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/unittest/core_service_gtest/zero_branch_test.cpp b/test/unittest/core_service_gtest/zero_branch_test.cpp index 1a0a6e0bb..39ea0acca 100644 --- a/test/unittest/core_service_gtest/zero_branch_test.cpp +++ b/test/unittest/core_service_gtest/zero_branch_test.cpp @@ -1314,7 +1314,7 @@ HWTEST_F(BranchTest, Telephony_SimManager_004, Function | MediumTest | Level1) HWTEST_F(BranchTest, Telephony_SimStateManager_001, Function | MediumTest | Level1) { std::shared_ptr telRilManager = std::make_shared(); - telRilManager->OnInit(); + //telRilManager->OnInit(); std::shared_ptr simStateManager = std::make_shared(telRilManager); std::shared_ptr runner = AppExecFwk::EventRunner::Create("test"); simStateManager->RegisterCoreNotify(nullptr, 1); @@ -1344,8 +1344,8 @@ HWTEST_F(BranchTest, Telephony_SimStateManager_001, Function | MediumTest | Leve EXPECT_GT(simStateManager->UnlockSimLock(0, mPersoLockInfo, mLockStatusResponse), TELEPHONY_ERR_SUCCESS); SimAuthenticationResponse mResponse; EXPECT_NE(simStateManager->SimAuthentication(0, "", "", mResponse), TELEPHONY_ERR_SUCCESS); - auto simStateManagerTwo = std::make_shared(telRilManager); - simStateManager->simStateHandle_ = std::make_shared(runner, simStateManagerTwo); + //auto simStateManagerTwo = std::make_shared(telRilManager); + simStateManager->simStateHandle_ = std::make_shared(runner, simStateManager); EXPECT_GE(simStateManager->GetCardType(), CardType::UNKNOWN_CARD); EXPECT_GT(simStateManager->UnlockSimLock(0, mPersoLockInfo, mLockStatusResponse), TELEPHONY_ERR_SUCCESS); EXPECT_NE(simStateManager->SimAuthentication(0, "", "", mResponse), TELEPHONY_ERR_SUCCESS); -- Gitee From 7ca7dc18b6bad5b9e3e5f8f4b71e74e3cbc3c208 Mon Sep 17 00:00:00 2001 From: zhujc0606 Date: Fri, 14 Apr 2023 09:18:13 +0800 Subject: [PATCH 5/6] update --- services/tel_ril/include/tel_ril_base.h | 7 ------- services/tel_ril/src/tel_ril_sim.cpp | 1 - 2 files changed, 8 deletions(-) diff --git a/services/tel_ril/include/tel_ril_base.h b/services/tel_ril/include/tel_ril_base.h index c3233e7bc..4eacd1f7f 100644 --- a/services/tel_ril/include/tel_ril_base.h +++ b/services/tel_ril/include/tel_ril_base.h @@ -141,7 +141,6 @@ template inline int32_t TelRilBase::Response( const char *funcName, const HDI::Ril::V1_1::RilRadioResponseInfo &iResponseInfo, T data) { - TELEPHONY_LOGI("zjc TTelRilBase::Response start1"); auto getDataFunc = [data](std::shared_ptr telRilRequest) { return data; }; return Response(funcName, iResponseInfo, getDataFunc); } @@ -150,7 +149,6 @@ template inline int32_t TelRilBase::Response( const char *funcName, const HDI::Ril::V1_1::RilRadioResponseInfo &iResponseInfo, std::shared_ptr data) { - TELEPHONY_LOGI("zjc TTelRilBase::Response start2"); if (data == nullptr) { TELEPHONY_LOGE("Response func %{public}s data is null", funcName); return TELEPHONY_ERR_LOCAL_PTR_NULL; @@ -163,7 +161,6 @@ template inline int32_t TelRilBase::Response(const char *funcName, const HDI::Ril::V1_1::RilRadioResponseInfo &iResponseInfo, std::function(std::shared_ptr)> getDataFunc) { - TELEPHONY_LOGI("zjc TTelRilBase::Response start3"); return Response>(funcName, iResponseInfo, getDataFunc); } @@ -171,7 +168,6 @@ template inline int32_t TelRilBase::Response(const char *funcName, const HDI::Ril::V1_1::RilRadioResponseInfo &iResponseInfo, std::function)> getDataFunc) { - TELEPHONY_LOGI("zjc TTelRilBase::Response start4"); const auto &radioResponseInfo = BuildHRilRadioResponseInfo(iResponseInfo); std::shared_ptr telRilRequest = FindTelRilRequest(radioResponseInfo); if (telRilRequest == nullptr || telRilRequest->pointer_ == nullptr) { @@ -179,7 +175,6 @@ inline int32_t TelRilBase::Response(const char *funcName, const HDI::Ril::V1_1:: return TELEPHONY_ERR_ARGUMENT_INVALID; } if (radioResponseInfo.error != HRilErrType::NONE) { - TELEPHONY_LOGI("zjc TTelRilBase::Response start5"); return ErrorResponse(telRilRequest, radioResponseInfo); } return SendHandlerEvent(funcName, telRilRequest, getDataFunc); @@ -189,7 +184,6 @@ template inline int32_t TelRilBase::SendHandlerEvent(const char *funcName, std::shared_ptr telRilRequest, std::function)> getDataFunc) { - TELEPHONY_LOGI("zjc TTelRilBase::SendHandlerEvent start1"); auto handler = telRilRequest->pointer_->GetOwner(); if (handler == nullptr) { TELEPHONY_LOGE("func %{public}s handler == nullptr !!!", funcName); @@ -202,7 +196,6 @@ template inline int32_t TelRilBase::SendEventData( const char *funcName, uint32_t eventId, std::shared_ptr handler, T data) { - TELEPHONY_LOGI("zjc TTelRilBase::SendEventData start1"); if (!handler->SendEvent(eventId, data)) { TELEPHONY_LOGE("func %{public}s Send eventId:%{public}d is failed!", funcName, eventId); return TELEPHONY_ERR_IPC_CONNECT_STUB_FAIL; diff --git a/services/tel_ril/src/tel_ril_sim.cpp b/services/tel_ril/src/tel_ril_sim.cpp index 729748a6b..f39a368f2 100644 --- a/services/tel_ril/src/tel_ril_sim.cpp +++ b/services/tel_ril/src/tel_ril_sim.cpp @@ -150,7 +150,6 @@ int32_t TelRilSim::ProcessIccIoInfo( int32_t TelRilSim::GetSimStatusResponse( const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::CardStatusInfo &result) { - TELEPHONY_LOGI("zjc TelRilSim::GetSimStatusResponse start"); std::shared_ptr cardStatusInfo = std::make_shared(); BuildCardStatusInfo(cardStatusInfo, result); return Response(TELEPHONY_LOG_FUNC_NAME, responseInfo, cardStatusInfo); -- Gitee From 0d87f85ac609fd02ac6ea01d4e988fa923af864b Mon Sep 17 00:00:00 2001 From: zhujc0606 Date: Fri, 14 Apr 2023 09:22:15 +0800 Subject: [PATCH 6/6] update --- test/unittest/core_service_gtest/zero_branch_test.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/unittest/core_service_gtest/zero_branch_test.cpp b/test/unittest/core_service_gtest/zero_branch_test.cpp index 39ea0acca..1a0a6e0bb 100644 --- a/test/unittest/core_service_gtest/zero_branch_test.cpp +++ b/test/unittest/core_service_gtest/zero_branch_test.cpp @@ -1314,7 +1314,7 @@ HWTEST_F(BranchTest, Telephony_SimManager_004, Function | MediumTest | Level1) HWTEST_F(BranchTest, Telephony_SimStateManager_001, Function | MediumTest | Level1) { std::shared_ptr telRilManager = std::make_shared(); - //telRilManager->OnInit(); + telRilManager->OnInit(); std::shared_ptr simStateManager = std::make_shared(telRilManager); std::shared_ptr runner = AppExecFwk::EventRunner::Create("test"); simStateManager->RegisterCoreNotify(nullptr, 1); @@ -1344,8 +1344,8 @@ HWTEST_F(BranchTest, Telephony_SimStateManager_001, Function | MediumTest | Leve EXPECT_GT(simStateManager->UnlockSimLock(0, mPersoLockInfo, mLockStatusResponse), TELEPHONY_ERR_SUCCESS); SimAuthenticationResponse mResponse; EXPECT_NE(simStateManager->SimAuthentication(0, "", "", mResponse), TELEPHONY_ERR_SUCCESS); - //auto simStateManagerTwo = std::make_shared(telRilManager); - simStateManager->simStateHandle_ = std::make_shared(runner, simStateManager); + auto simStateManagerTwo = std::make_shared(telRilManager); + simStateManager->simStateHandle_ = std::make_shared(runner, simStateManagerTwo); EXPECT_GE(simStateManager->GetCardType(), CardType::UNKNOWN_CARD); EXPECT_GT(simStateManager->UnlockSimLock(0, mPersoLockInfo, mLockStatusResponse), TELEPHONY_ERR_SUCCESS); EXPECT_NE(simStateManager->SimAuthentication(0, "", "", mResponse), TELEPHONY_ERR_SUCCESS); -- Gitee