From 79c8c336d6c3baf9edf78fe5c53f5b06f0e3d9b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E5=B0=91=E4=BF=8A?= Date: Tue, 7 Jan 2025 12:03:48 +0000 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E7=94=B5?= =?UTF-8?q?=E8=AF=9D=E5=8F=B7=E7=A0=81=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 汪少俊 --- services/sim/src/multi_sim_controller.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/services/sim/src/multi_sim_controller.cpp b/services/sim/src/multi_sim_controller.cpp index 3a3b070be..fdd7d8973 100644 --- a/services/sim/src/multi_sim_controller.cpp +++ b/services/sim/src/multi_sim_controller.cpp @@ -352,6 +352,9 @@ bool MultiSimController::InitShowNumber(int slotId) showNumber = simFileManager_[slotId]->GetSimTelephoneNumber(); int32_t result = TELEPHONY_ERROR; result = SetShowNumberToDB(slotId, showNumber); + if (!showNumber.empty()) { + result = SetShowNumberToDB(slotId, showNumber); + } return result == TELEPHONY_ERR_SUCCESS; } @@ -1099,7 +1102,8 @@ int32_t MultiSimController::GetShowNumber(int32_t slotId, std::u16string &showNu } showNumber = simFileManager_[slotId]->GetSimTelephoneNumber(); if (!showNumber.empty()) { - TELEPHONY_LOGI("get phone number from sim"); + int32_t result = SetShowNumberToDB(slotId, showNumber) + TELEPHONY_LOGI("slotId: %{public}d get phone number from sim and save result: %{public}d", slotId, result); return TELEPHONY_ERR_SUCCESS; } int curSimId; @@ -1229,6 +1233,11 @@ int32_t MultiSimController::GetSimTelephoneNumber(int32_t slotId, std::u16string telephoneNumber = Str8ToStr16(result); TELEPHONY_LOGI("impu result is empty:%{public}s, slotId:%{public}d", (telephoneNumber.empty() ? "true" : "false"), slotId); + if (!telephoneNumber.empty()) { + int32_t result; + result = SetShowNumberToDB(slotId, telephoneNumber); + TELEPHONY_LOGI("slotId: %{public}d save impu phone number result: %{public}d", slotId, result); + } return TELEPHONY_ERR_SUCCESS; } -- Gitee From 3fa7134dad4a662885ce98943d205219fb87676e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E5=B0=91=E4=BF=8A?= Date: Wed, 8 Jan 2025 02:29:10 +0000 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 汪少俊 --- services/sim/src/multi_sim_controller.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/sim/src/multi_sim_controller.cpp b/services/sim/src/multi_sim_controller.cpp index fdd7d8973..70805796e 100644 --- a/services/sim/src/multi_sim_controller.cpp +++ b/services/sim/src/multi_sim_controller.cpp @@ -1102,7 +1102,7 @@ int32_t MultiSimController::GetShowNumber(int32_t slotId, std::u16string &showNu } showNumber = simFileManager_[slotId]->GetSimTelephoneNumber(); if (!showNumber.empty()) { - int32_t result = SetShowNumberToDB(slotId, showNumber) + int32_t result = SetShowNumberToDB(slotId, showNumber); TELEPHONY_LOGI("slotId: %{public}d get phone number from sim and save result: %{public}d", slotId, result); return TELEPHONY_ERR_SUCCESS; } -- Gitee From f4131cfac7308d344181ee7ed24c8e5302eb238c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E5=B0=91=E4=BF=8A?= Date: Wed, 8 Jan 2025 02:54:07 +0000 Subject: [PATCH 3/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 汪少俊 --- services/sim/src/multi_sim_controller.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/sim/src/multi_sim_controller.cpp b/services/sim/src/multi_sim_controller.cpp index 70805796e..87b10d866 100644 --- a/services/sim/src/multi_sim_controller.cpp +++ b/services/sim/src/multi_sim_controller.cpp @@ -1234,7 +1234,7 @@ int32_t MultiSimController::GetSimTelephoneNumber(int32_t slotId, std::u16string TELEPHONY_LOGI("impu result is empty:%{public}s, slotId:%{public}d", (telephoneNumber.empty() ? "true" : "false"), slotId); if (!telephoneNumber.empty()) { - int32_t result; + int32_t result = TELEPHONY_ERROR; result = SetShowNumberToDB(slotId, telephoneNumber); TELEPHONY_LOGI("slotId: %{public}d save impu phone number result: %{public}d", slotId, result); } -- Gitee