From 4c608e7eb5aa230a8be499afe51c3a1f810f4b02 Mon Sep 17 00:00:00 2001 From: MisterE Date: Tue, 19 Nov 2024 19:28:55 +0800 Subject: [PATCH 01/13] codecheck Signed-off-by: MisterE --- services/dtbschedmgr/src/continue/dsched_continue.cpp | 5 ++--- services/dtbschedmgr/test/BUILD.gn | 1 - .../test/unittest/continue/dsched_continue_test.cpp | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/services/dtbschedmgr/src/continue/dsched_continue.cpp b/services/dtbschedmgr/src/continue/dsched_continue.cpp index edca12ae..181fee94 100644 --- a/services/dtbschedmgr/src/continue/dsched_continue.cpp +++ b/services/dtbschedmgr/src/continue/dsched_continue.cpp @@ -450,10 +450,9 @@ int32_t DSchedContinue::UpdateElementInfo(std::shared_ptr } auto element = cmd->want_.GetElement(); DmsAbilityInfo finalAbility = result[0]; - HILOGD("UpdateElementInfo final sink ability total:%{public}d; detail info: " + HILOGD("UpdateElementInfo final sink ability detail info: " "bundleName: %{public}s; abilityName: %{public}s; moduleName: %{public}s", - result.size(), cmd->dstBundleName_.c_str(), - finalAbility.abilityName.c_str(), finalAbility.moduleName.c_str()); + cmd->dstBundleName_.c_str(), finalAbility.abilityName.c_str(), finalAbility.moduleName.c_str()); cmd->want_.SetElementName(element.GetDeviceID(), cmd->dstBundleName_, finalAbility.abilityName, finalAbility.moduleName); return ERR_OK; diff --git a/services/dtbschedmgr/test/BUILD.gn b/services/dtbschedmgr/test/BUILD.gn index 4e3f594d..0d320d62 100644 --- a/services/dtbschedmgr/test/BUILD.gn +++ b/services/dtbschedmgr/test/BUILD.gn @@ -34,7 +34,6 @@ config("test_config") { "${distributed_service}/dtbschedmgr/include/continue/state/sink_state", "${distributed_service}/dtbschedmgr/include/distributedWant", "${distributed_service}/dtbschedmgr/include/softbus_adapter/transport", - "${distributed_service}/dtbschedmgr/include/mission", "${distributed_service}/dtbschedmgr/test/unittest", "${dms_path}/common/include", "${dms_path}/interfaces/innerkits/distributed_event/include", diff --git a/services/dtbschedmgr/test/unittest/continue/dsched_continue_test.cpp b/services/dtbschedmgr/test/unittest/continue/dsched_continue_test.cpp index 6825905a..6cbb0cbc 100644 --- a/services/dtbschedmgr/test/unittest/continue/dsched_continue_test.cpp +++ b/services/dtbschedmgr/test/unittest/continue/dsched_continue_test.cpp @@ -20,7 +20,7 @@ #include "dtbschedmgr_log.h" #include "softbus_error_code.h" #include "test_log.h" -#include "distributed_bm_storage.h" +#include "mission/distributed_bm_storage.h" using namespace testing; using namespace testing::ext; From d0fb02f0a3b9761b31f5126b1ca77b677ca36acf Mon Sep 17 00:00:00 2001 From: MisterE Date: Tue, 19 Nov 2024 20:00:15 +0800 Subject: [PATCH 02/13] codecheck Signed-off-by: MisterE --- services/dtbschedmgr/src/continue/dsched_continue.cpp | 11 +++++------ .../test/unittest/continue/dsched_continue_test.cpp | 5 +++++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/services/dtbschedmgr/src/continue/dsched_continue.cpp b/services/dtbschedmgr/src/continue/dsched_continue.cpp index 181fee94..c6aa2ee0 100644 --- a/services/dtbschedmgr/src/continue/dsched_continue.cpp +++ b/services/dtbschedmgr/src/continue/dsched_continue.cpp @@ -434,7 +434,7 @@ int32_t DSchedContinue::UpdateElementInfo(std::shared_ptr srcContinueType.c_str()); DmsBundleInfo distributedBundleInfo; if (!DmsBmStorage::GetInstance()->GetDistributedBundleInfo( - cmd->dstDeviceId_, cmd->dstBundleName_, distributedBundleInfo)) { + cmd->dstDeviceId_, cmd->dstBundleName_, distributedBundleInfo)) { HILOGE("UpdateElementInfo can not found bundle info for bundle name: %{public}s", cmd->dstBundleName_.c_str()); return CAN_NOT_FOUND_MODULE_ERR; @@ -1008,11 +1008,6 @@ int32_t DSchedContinue::ExecuteContinueData(std::shared_ptrcontinueType_ = CONTINUE_TYPE2; cmd->want_.SetElementName("", BUNDLEMAME_1, ABILITY_NAME_DIFF_AS_CONTINUE_TYPE, MODULE_NAME3); ret = conti->UpdateElementInfo(cmd); + EXPECT_EQ(ret, ERR_OK); + // has continueType, no same module + cmd->continueType_ = CONTINUE_TYPE2; + cmd->want_.SetElementName("", BUNDLEMAME_1, CONTINUE_TYPE1, MODULE_NAME3); + ret = conti->UpdateElementInfo(cmd); EXPECT_EQ(ret, CAN_NOT_FOUND_MODULE_ERR); DTEST_LOG << "DSchedContinueTest DSchedContinueTest_0017_2 end ret:" << ret << std::endl; usleep(WAITTIME); From 42f8a49523a270724bbf6eec24838313b03c353e Mon Sep 17 00:00:00 2001 From: MisterE Date: Tue, 19 Nov 2024 20:48:06 +0800 Subject: [PATCH 03/13] codecheck Signed-off-by: MisterE --- services/dtbschedmgr/src/continue/dsched_continue.cpp | 5 +++-- .../test/unittest/continue/dsched_continue_test.cpp | 10 +++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/services/dtbschedmgr/src/continue/dsched_continue.cpp b/services/dtbschedmgr/src/continue/dsched_continue.cpp index c6aa2ee0..73aa8e04 100644 --- a/services/dtbschedmgr/src/continue/dsched_continue.cpp +++ b/services/dtbschedmgr/src/continue/dsched_continue.cpp @@ -433,8 +433,9 @@ int32_t DSchedContinue::UpdateElementInfo(std::shared_ptr HILOGD("UpdateElementInfo srcModuleName: %{public}s; srcContinueType:%{}s", srcModuleName.c_str(), srcContinueType.c_str()); DmsBundleInfo distributedBundleInfo; - if (!DmsBmStorage::GetInstance()->GetDistributedBundleInfo( - cmd->dstDeviceId_, cmd->dstBundleName_, distributedBundleInfo)) { + std::string localDeviceId; + if (!GetLocalDeviceId(localDeviceId) || !DmsBmStorage::GetInstance()->GetDistributedBundleInfo( + localDeviceId, cmd->dstBundleName_, distributedBundleInfo)) { HILOGE("UpdateElementInfo can not found bundle info for bundle name: %{public}s", cmd->dstBundleName_.c_str()); return CAN_NOT_FOUND_MODULE_ERR; diff --git a/services/dtbschedmgr/test/unittest/continue/dsched_continue_test.cpp b/services/dtbschedmgr/test/unittest/continue/dsched_continue_test.cpp index ae0e8300..215b42e2 100644 --- a/services/dtbschedmgr/test/unittest/continue/dsched_continue_test.cpp +++ b/services/dtbschedmgr/test/unittest/continue/dsched_continue_test.cpp @@ -611,6 +611,11 @@ HWTEST_F(DSchedContinueTest, DSchedContinueTest_0017_1, TestSize.Level0) usleep(WAITTIME); } +/** + * @tc.name: DSchedContinueTest_0017_2 + * @tc.desc: UpdateElementInfo + * @tc.type: FUNC + */ HWTEST_F(DSchedContinueTest, DSchedContinueTest_0017_2, TestSize.Level0) { DTEST_LOG << "DSchedContinueTest DSchedContinueTest_0017_2 begin" << std::endl; @@ -654,11 +659,6 @@ HWTEST_F(DSchedContinueTest, DSchedContinueTest_0017_2, TestSize.Level0) cmd->want_.SetElementName("", BUNDLEMAME_1, ABILITY_NAME_DIFF_AS_CONTINUE_TYPE, MODULE_NAME3); ret = conti->UpdateElementInfo(cmd); EXPECT_EQ(ret, ERR_OK); - // has continueType, no same module - cmd->continueType_ = CONTINUE_TYPE2; - cmd->want_.SetElementName("", BUNDLEMAME_1, CONTINUE_TYPE1, MODULE_NAME3); - ret = conti->UpdateElementInfo(cmd); - EXPECT_EQ(ret, CAN_NOT_FOUND_MODULE_ERR); DTEST_LOG << "DSchedContinueTest DSchedContinueTest_0017_2 end ret:" << ret << std::endl; usleep(WAITTIME); } From b8c2b77171f6a955e94f700df7c5de234d70960d Mon Sep 17 00:00:00 2001 From: MisterE Date: Tue, 19 Nov 2024 22:06:10 +0800 Subject: [PATCH 04/13] codecheck Signed-off-by: MisterE --- .../test/unittest/continue/dsched_continue_test.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/services/dtbschedmgr/test/unittest/continue/dsched_continue_test.cpp b/services/dtbschedmgr/test/unittest/continue/dsched_continue_test.cpp index 215b42e2..cf6f39ee 100644 --- a/services/dtbschedmgr/test/unittest/continue/dsched_continue_test.cpp +++ b/services/dtbschedmgr/test/unittest/continue/dsched_continue_test.cpp @@ -628,33 +628,38 @@ HWTEST_F(DSchedContinueTest, DSchedContinueTest_0017_2, TestSize.Level0) auto conti = std::make_shared(subType, direction, callback, info); conti->Init(); auto cmd = std::make_shared(); - EXPECT_CALL(*dmsStoreMock, GetLocalDeviceId(_)).WillOnce(Return(true)); // no continueType, diff module + EXPECT_CALL(*dmsStoreMock, GetLocalDeviceId(_)).WillOnce(Return(true)); cmd->continueType_ = CONTINUE_TYPE1; cmd->want_.SetElementName("", BUNDLEMAME_1, ABILITY_NAME_SAME_AS_CONTINUE_TYPE, MODULE_NAME2); int32_t ret = conti->UpdateElementInfo(cmd); EXPECT_EQ(ret, CAN_NOT_FOUND_MODULE_ERR); // no continueType, same module + EXPECT_CALL(*dmsStoreMock, GetLocalDeviceId(_)).WillOnce(Return(true)); cmd->continueType_ = CONTINUE_TYPE1; cmd->want_.SetElementName("", BUNDLEMAME_1, ABILITY_NAME_SAME_AS_CONTINUE_TYPE, MODULE_NAME1); ret = conti->UpdateElementInfo(cmd); EXPECT_EQ(ret, ERR_OK); // no continueType with quick start, same module + EXPECT_CALL(*dmsStoreMock, GetLocalDeviceId(_)).WillOnce(Return(true)); cmd->continueType_ = CONTINUE_TYPE1_QUICK; cmd->want_.SetElementName("", BUNDLEMAME_1, ABILITY_NAME_SAME_AS_CONTINUE_TYPE, MODULE_NAME1); ret = conti->UpdateElementInfo(cmd); EXPECT_EQ(ret, ERR_OK); // has continueType, same module + EXPECT_CALL(*dmsStoreMock, GetLocalDeviceId(_)).WillOnce(Return(true)); cmd->continueType_ = CONTINUE_TYPE2; cmd->want_.SetElementName("", BUNDLEMAME_1, ABILITY_NAME_DIFF_AS_CONTINUE_TYPE, MODULE_NAME2); ret = conti->UpdateElementInfo(cmd); EXPECT_EQ(ret, ERR_OK); // has continueType, diff module + EXPECT_CALL(*dmsStoreMock, GetLocalDeviceId(_)).WillOnce(Return(true)); cmd->continueType_ = CONTINUE_TYPE2; cmd->want_.SetElementName("", BUNDLEMAME_1, ABILITY_NAME_DIFF_AS_CONTINUE_TYPE, MODULE_NAME1); ret = conti->UpdateElementInfo(cmd); EXPECT_EQ(ret, ERR_OK); // has continueType, no module + EXPECT_CALL(*dmsStoreMock, GetLocalDeviceId(_)).WillOnce(Return(true)); cmd->continueType_ = CONTINUE_TYPE2; cmd->want_.SetElementName("", BUNDLEMAME_1, ABILITY_NAME_DIFF_AS_CONTINUE_TYPE, MODULE_NAME3); ret = conti->UpdateElementInfo(cmd); From 6a65f12cc3775c888e8e141c6fcb0a9b1792afba Mon Sep 17 00:00:00 2001 From: MisterE Date: Tue, 19 Nov 2024 22:06:10 +0800 Subject: [PATCH 05/13] codecheck Signed-off-by: MisterE --- .../test/unittest/continue/dsched_continue_test.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/services/dtbschedmgr/test/unittest/continue/dsched_continue_test.cpp b/services/dtbschedmgr/test/unittest/continue/dsched_continue_test.cpp index 215b42e2..cf6f39ee 100644 --- a/services/dtbschedmgr/test/unittest/continue/dsched_continue_test.cpp +++ b/services/dtbschedmgr/test/unittest/continue/dsched_continue_test.cpp @@ -628,33 +628,38 @@ HWTEST_F(DSchedContinueTest, DSchedContinueTest_0017_2, TestSize.Level0) auto conti = std::make_shared(subType, direction, callback, info); conti->Init(); auto cmd = std::make_shared(); - EXPECT_CALL(*dmsStoreMock, GetLocalDeviceId(_)).WillOnce(Return(true)); // no continueType, diff module + EXPECT_CALL(*dmsStoreMock, GetLocalDeviceId(_)).WillOnce(Return(true)); cmd->continueType_ = CONTINUE_TYPE1; cmd->want_.SetElementName("", BUNDLEMAME_1, ABILITY_NAME_SAME_AS_CONTINUE_TYPE, MODULE_NAME2); int32_t ret = conti->UpdateElementInfo(cmd); EXPECT_EQ(ret, CAN_NOT_FOUND_MODULE_ERR); // no continueType, same module + EXPECT_CALL(*dmsStoreMock, GetLocalDeviceId(_)).WillOnce(Return(true)); cmd->continueType_ = CONTINUE_TYPE1; cmd->want_.SetElementName("", BUNDLEMAME_1, ABILITY_NAME_SAME_AS_CONTINUE_TYPE, MODULE_NAME1); ret = conti->UpdateElementInfo(cmd); EXPECT_EQ(ret, ERR_OK); // no continueType with quick start, same module + EXPECT_CALL(*dmsStoreMock, GetLocalDeviceId(_)).WillOnce(Return(true)); cmd->continueType_ = CONTINUE_TYPE1_QUICK; cmd->want_.SetElementName("", BUNDLEMAME_1, ABILITY_NAME_SAME_AS_CONTINUE_TYPE, MODULE_NAME1); ret = conti->UpdateElementInfo(cmd); EXPECT_EQ(ret, ERR_OK); // has continueType, same module + EXPECT_CALL(*dmsStoreMock, GetLocalDeviceId(_)).WillOnce(Return(true)); cmd->continueType_ = CONTINUE_TYPE2; cmd->want_.SetElementName("", BUNDLEMAME_1, ABILITY_NAME_DIFF_AS_CONTINUE_TYPE, MODULE_NAME2); ret = conti->UpdateElementInfo(cmd); EXPECT_EQ(ret, ERR_OK); // has continueType, diff module + EXPECT_CALL(*dmsStoreMock, GetLocalDeviceId(_)).WillOnce(Return(true)); cmd->continueType_ = CONTINUE_TYPE2; cmd->want_.SetElementName("", BUNDLEMAME_1, ABILITY_NAME_DIFF_AS_CONTINUE_TYPE, MODULE_NAME1); ret = conti->UpdateElementInfo(cmd); EXPECT_EQ(ret, ERR_OK); // has continueType, no module + EXPECT_CALL(*dmsStoreMock, GetLocalDeviceId(_)).WillOnce(Return(true)); cmd->continueType_ = CONTINUE_TYPE2; cmd->want_.SetElementName("", BUNDLEMAME_1, ABILITY_NAME_DIFF_AS_CONTINUE_TYPE, MODULE_NAME3); ret = conti->UpdateElementInfo(cmd); From bdcc54abc3e2db85d50131c2b42e74e69238a939 Mon Sep 17 00:00:00 2001 From: MisterE Date: Tue, 19 Nov 2024 22:44:51 +0800 Subject: [PATCH 06/13] codecheck Signed-off-by: MisterE --- services/dtbschedmgr/src/continue/dsched_continue.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/dtbschedmgr/src/continue/dsched_continue.cpp b/services/dtbschedmgr/src/continue/dsched_continue.cpp index 73aa8e04..ab0996a6 100644 --- a/services/dtbschedmgr/src/continue/dsched_continue.cpp +++ b/services/dtbschedmgr/src/continue/dsched_continue.cpp @@ -430,7 +430,7 @@ int32_t DSchedContinue::UpdateElementInfo(std::shared_ptr } std::string srcContinueType = cmd->continueType_; ContinueTypeFormat(srcContinueType); - HILOGD("UpdateElementInfo srcModuleName: %{public}s; srcContinueType:%{}s", srcModuleName.c_str(), + HILOGD("UpdateElementInfo srcModuleName: %{public}s; srcContinueType:%{public}s", srcModuleName.c_str(), srcContinueType.c_str()); DmsBundleInfo distributedBundleInfo; std::string localDeviceId; From 0a72ac8ec96aad2a47c9e289eb72fa8423071daf Mon Sep 17 00:00:00 2001 From: MisterE Date: Thu, 21 Nov 2024 14:11:46 +0800 Subject: [PATCH 07/13] =?UTF-8?q?=E5=BC=82moduleName=E5=8F=AF=E6=8E=A5?= =?UTF-8?q?=E7=BB=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: MisterE --- .../include/continue/dsched_continue.h | 6 +- .../mission/dms_continue_recv_manager.h | 2 +- .../src/continue/dsched_continue.cpp | 144 +++++++++--------- .../src/mission/dms_continue_recv_manager.cpp | 10 +- .../mission/dms_continue_manager_test.cpp | 29 +--- 5 files changed, 81 insertions(+), 110 deletions(-) diff --git a/services/dtbschedmgr/include/continue/dsched_continue.h b/services/dtbschedmgr/include/continue/dsched_continue.h index dfb5ecd1..ecf687db 100644 --- a/services/dtbschedmgr/include/continue/dsched_continue.h +++ b/services/dtbschedmgr/include/continue/dsched_continue.h @@ -154,6 +154,9 @@ private: int32_t ExecuteContinueReply(); int32_t ExecuteContinueSend(std::shared_ptr data); int32_t ExecuteContinueData(std::shared_ptr cmd); + int32_t UpdateElementInfo(std::shared_ptr cmd); + void FindSinkContinueAbilityInfo(const std::string &srcModuleName, const std::string &srcContinueType, + std::vector &dmsAbilityInfos, std::vector &result); int32_t ExecuteNotifyComplete(int32_t result); int32_t ExecuteContinueEnd(int32_t result); int32_t ExecuteContinueError(int32_t result); @@ -165,9 +168,6 @@ private: uint32_t accessToken); int32_t OnContinueDataCmd(std::shared_ptr cmd); int32_t OnNotifyComplete(int32_t missionId, bool isSuccess); - int32_t UpdateElementInfo(std::shared_ptr cmd); - void FindSinkContinueAbilityInfo(const std::string &srcModuleName, const std::string &srcContinueType, - std::vector &dmsAbilityInfos, std::vector &result); void ContinueTypeFormat(std::string &continueType); int32_t OnContinueEndCmd(std::shared_ptr cmd); int32_t OnContinueEnd(int32_t result); diff --git a/services/dtbschedmgr/include/mission/dms_continue_recv_manager.h b/services/dtbschedmgr/include/mission/dms_continue_recv_manager.h index 242c9970..124fcf77 100644 --- a/services/dtbschedmgr/include/mission/dms_continue_recv_manager.h +++ b/services/dtbschedmgr/include/mission/dms_continue_recv_manager.h @@ -105,7 +105,7 @@ private: const int32_t state, const int32_t retry = 0); void NotifyRecvBroadcast(const sptr& obj, const currentIconInfo& continueInfo, const int32_t state); bool IsBundleContinuable(const AppExecFwk::BundleInfo& bundleInfo, const std::string &srcAbilityName, - const std::string &srcContinueType, bool isSameBundle); + const std::string &srcContinueType); std::string ContinueTypeFormat(const std::string &continueType); void FindToNotifyRecvBroadcast(const std::string& senderNetworkId, const std::string& bundleName, const std::string& continueType); diff --git a/services/dtbschedmgr/src/continue/dsched_continue.cpp b/services/dtbschedmgr/src/continue/dsched_continue.cpp index ab0996a6..78bb97df 100644 --- a/services/dtbschedmgr/src/continue/dsched_continue.cpp +++ b/services/dtbschedmgr/src/continue/dsched_continue.cpp @@ -421,82 +421,7 @@ int32_t DSchedContinue::OnNotifyComplete(int32_t missionId, bool isSuccess) return ERR_OK; } -int32_t DSchedContinue::UpdateElementInfo(std::shared_ptr cmd) -{ - std::string srcModuleName = cmd->want_.GetModuleName(); - if (srcModuleName.empty()) { - HILOGD("UpdateElementInfo srcModuleName from element is empty"); - srcModuleName = cmd->want_.GetStringParam(OHOS::AAFwk::Want::PARAM_MODULE_NAME); - } - std::string srcContinueType = cmd->continueType_; - ContinueTypeFormat(srcContinueType); - HILOGD("UpdateElementInfo srcModuleName: %{public}s; srcContinueType:%{public}s", srcModuleName.c_str(), - srcContinueType.c_str()); - DmsBundleInfo distributedBundleInfo; - std::string localDeviceId; - if (!GetLocalDeviceId(localDeviceId) || !DmsBmStorage::GetInstance()->GetDistributedBundleInfo( - localDeviceId, cmd->dstBundleName_, distributedBundleInfo)) { - HILOGE("UpdateElementInfo can not found bundle info for bundle name: %{public}s", - cmd->dstBundleName_.c_str()); - return CAN_NOT_FOUND_MODULE_ERR; - } - std::vector dmsAbilityInfos = distributedBundleInfo.dmsAbilityInfos; - std::vector result; - FindSinkContinueAbilityInfo(srcModuleName, srcContinueType, dmsAbilityInfos, result); - if (result.empty()) { - HILOGE("UpdateElementInfo can not found bundle info for bundle name: %{public}s", - cmd->dstBundleName_.c_str()); - return CAN_NOT_FOUND_MODULE_ERR; - } - auto element = cmd->want_.GetElement(); - DmsAbilityInfo finalAbility = result[0]; - HILOGD("UpdateElementInfo final sink ability detail info: " - "bundleName: %{public}s; abilityName: %{public}s; moduleName: %{public}s", - cmd->dstBundleName_.c_str(), finalAbility.abilityName.c_str(), finalAbility.moduleName.c_str()); - cmd->want_.SetElementName(element.GetDeviceID(), cmd->dstBundleName_, finalAbility.abilityName, - finalAbility.moduleName); - return ERR_OK; -} - -void DSchedContinue::FindSinkContinueAbilityInfo(const std::string &srcModuleName, const std::string &srcContinueType, - std::vector &dmsAbilityInfos, std::vector &result) -{ - bool sameAbilityGot = false; - bool hasSameModule = false; - for (const auto &abilityInfoElement: dmsAbilityInfos) { - std::vector continueTypes = abilityInfoElement.continueType; - for (std::string &continueTypeElement: continueTypes) { - ContinueTypeFormat(continueTypeElement); - HILOGD("UpdateElementInfo check sink continue ability, current: " - "continueType: %{public}s; abilityName: %{public}s; moduleName: %{public}s", - continueTypeElement.c_str(), abilityInfoElement.abilityName.c_str(), - abilityInfoElement.moduleName.c_str()); - if (continueTypeElement != srcContinueType) { - continue; - } - if (continueTypeElement == abilityInfoElement.abilityName && - srcModuleName == abilityInfoElement.moduleName) { - sameAbilityGot = true; - result.clear(); - result.push_back(abilityInfoElement); - break; - } else if (continueTypeElement != abilityInfoElement.abilityName && - srcModuleName == abilityInfoElement.moduleName) { - hasSameModule = true; - result.clear(); - result.push_back(abilityInfoElement); - break; - } else if (continueTypeElement != abilityInfoElement.abilityName) { - result.push_back(abilityInfoElement); - break; - } - } - if (sameAbilityGot || hasSameModule) { - break; - } - } -} void DSchedContinue::ContinueTypeFormat(std::string &continueType) { @@ -1055,6 +980,75 @@ int32_t DSchedContinue::ExecuteContinueData(std::shared_ptr cmd) +{ + std::string srcModuleName = cmd->want_.GetModuleName(); + if (srcModuleName.empty()) { + HILOGD("UpdateElementInfo srcModuleName from element is empty"); + srcModuleName = cmd->want_.GetStringParam(OHOS::AAFwk::Want::PARAM_MODULE_NAME); + } + std::string srcContinueType = cmd->continueType_; + ContinueTypeFormat(srcContinueType); + HILOGD("UpdateElementInfo srcModuleName: %{public}s; srcContinueType:%{public}s", srcModuleName.c_str(), + srcContinueType.c_str()); + DmsBundleInfo distributedBundleInfo; + std::string localDeviceId; + if (!GetLocalDeviceId(localDeviceId) || !DmsBmStorage::GetInstance()->GetDistributedBundleInfo( + localDeviceId, cmd->dstBundleName_, distributedBundleInfo)) { + HILOGE("UpdateElementInfo can not found bundle info for bundle name: %{public}s", + cmd->dstBundleName_.c_str()); + return CAN_NOT_FOUND_MODULE_ERR; + } + + std::vector dmsAbilityInfos = distributedBundleInfo.dmsAbilityInfos; + std::vector result; + FindSinkContinueAbilityInfo(srcModuleName, srcContinueType, dmsAbilityInfos, result); + if (result.empty()) { + HILOGE("UpdateElementInfo can not found bundle info for bundle name: %{public}s", + cmd->dstBundleName_.c_str()); + return CAN_NOT_FOUND_MODULE_ERR; + } + auto element = cmd->want_.GetElement(); + DmsAbilityInfo finalAbility = result[0]; + HILOGD("UpdateElementInfo final sink ability detail info: " + "bundleName: %{public}s; abilityName: %{public}s; moduleName: %{public}s", + cmd->dstBundleName_.c_str(), finalAbility.abilityName.c_str(), finalAbility.moduleName.c_str()); + cmd->want_.SetElementName(element.GetDeviceID(), cmd->dstBundleName_, finalAbility.abilityName, + finalAbility.moduleName); + return ERR_OK; +} + +void DSchedContinue::FindSinkContinueAbilityInfo(const std::string &srcModuleName, const std::string &srcContinueType, + std::vector &dmsAbilityInfos, std::vector &result) +{ + bool sameModuleGot = false; + for (const auto &abilityInfoElement: dmsAbilityInfos) { + std::vector continueTypes = abilityInfoElement.continueType; + for (std::string &continueTypeElement: continueTypes) { + ContinueTypeFormat(continueTypeElement); + HILOGD("UpdateElementInfo check sink continue ability, current: " + "continueType: %{public}s; abilityName: %{public}s; moduleName: %{public}s", + continueTypeElement.c_str(), abilityInfoElement.abilityName.c_str(), + abilityInfoElement.moduleName.c_str()); + if (continueTypeElement != srcContinueType) { + continue; + } + if (srcModuleName == abilityInfoElement.moduleName) { + sameModuleGot = true; + result.clear(); + result.push_back(abilityInfoElement); + break; + } else { + result.push_back(abilityInfoElement); + break; + } + } + if (sameModuleGot) { + break; + } + } +} + int32_t DSchedContinue::UpdateWantForContinueType(OHOS::AAFwk::Want& want) { std::string srcAbilityName = want.GetElement().GetAbilityName(); diff --git a/services/dtbschedmgr/src/mission/dms_continue_recv_manager.cpp b/services/dtbschedmgr/src/mission/dms_continue_recv_manager.cpp index 35539618..fe3dc065 100644 --- a/services/dtbschedmgr/src/mission/dms_continue_recv_manager.cpp +++ b/services/dtbschedmgr/src/mission/dms_continue_recv_manager.cpp @@ -360,7 +360,7 @@ int32_t DMSContinueRecvMgr::DealOnBroadcastBusiness(const std::string& senderNet } bool DMSContinueRecvMgr::IsBundleContinuable(const AppExecFwk::BundleInfo& bundleInfo, - const std::string &srcAbilityName, const std::string &srcContinueType, bool isSameBundle) + const std::string &srcAbilityName, const std::string &srcContinueType) { std::string formatSrcContinueType = ContinueTypeFormat(srcContinueType); for (auto &abilityInfo: bundleInfo.abilityInfos) { @@ -369,16 +369,12 @@ bool DMSContinueRecvMgr::IsBundleContinuable(const AppExecFwk::BundleInfo& bundl } for (const auto &continueTypeItem: abilityInfo.continueType) { HILOGI("IsBundleContinuable check: srcAbilityName:%{public}s; srcContinueType:%{public}s;" - " sinkAbilityName:%{public}s; sinkContinueType:%{public}s; isSameBundle: %{public}d", + " sinkAbilityName:%{public}s; sinkContinueType:%{public}s; ", srcAbilityName.c_str(), srcContinueType.c_str(), abilityInfo.name.c_str(), - continueTypeItem.c_str(), isSameBundle); + continueTypeItem.c_str()); if (continueTypeItem == srcContinueType || continueTypeItem == formatSrcContinueType) { return true; } - if ((srcContinueType == srcAbilityName || abilityInfo.name == continueTypeItem) - && isSameBundle && abilityInfo.name == srcAbilityName) { - return true; - } } } return false; diff --git a/services/dtbschedmgr/test/unittest/mission/dms_continue_manager_test.cpp b/services/dtbschedmgr/test/unittest/mission/dms_continue_manager_test.cpp index fbf6dad4..dbcd4de2 100644 --- a/services/dtbschedmgr/test/unittest/mission/dms_continue_manager_test.cpp +++ b/services/dtbschedmgr/test/unittest/mission/dms_continue_manager_test.cpp @@ -1197,7 +1197,6 @@ HWTEST_F(DMSContinueManagerTest, testIsBundleContinuable_001, TestSize.Level1) DTEST_LOG << "DMSContinueManagerTest testIsBundleContinuable_001 start" << std::endl; std::string srcAbilityName = "abilityName"; std::string srcContinueType = "continueType"; - bool isSameBundle = true; AppExecFwk::BundleInfo localBundleInfo; std::vector abilityInfos; @@ -1215,14 +1214,9 @@ HWTEST_F(DMSContinueManagerTest, testIsBundleContinuable_001, TestSize.Level1) DTEST_LOG << "GetRecvMgr failed." << std::endl; return; } - bool ret = recvMgr->IsBundleContinuable(localBundleInfo, srcAbilityName, - srcContinueType, isSameBundle); + bool ret = recvMgr->IsBundleContinuable(localBundleInfo, srcAbilityName, srcContinueType); EXPECT_EQ(ret, false); - isSameBundle = false; - ret = recvMgr->IsBundleContinuable(localBundleInfo, srcAbilityName, - srcContinueType, isSameBundle); - EXPECT_EQ(ret, false); DTEST_LOG << "DMSContinueManagerTest testIsBundleContinuable_001 end" << std::endl; } @@ -1236,7 +1230,6 @@ HWTEST_F(DMSContinueManagerTest, testIsBundleContinuable_002, TestSize.Level1) DTEST_LOG << "DMSContinueManagerTest testIsBundleContinuable_002 start" << std::endl; std::string srcAbilityName = "abilityName"; std::string srcContinueType = "continueType"; - bool isSameBundle = true; AppExecFwk::BundleInfo localBundleInfo; std::vector abilityInfos; @@ -1254,13 +1247,7 @@ HWTEST_F(DMSContinueManagerTest, testIsBundleContinuable_002, TestSize.Level1) DTEST_LOG << "GetRecvMgr failed." << std::endl; return; } - bool ret = recvMgr->IsBundleContinuable(localBundleInfo, srcAbilityName, - srcContinueType, isSameBundle); - EXPECT_EQ(ret, true); - - isSameBundle = false; - ret = recvMgr->IsBundleContinuable(localBundleInfo, srcAbilityName, - srcContinueType, isSameBundle); + bool ret = recvMgr->IsBundleContinuable(localBundleInfo, srcAbilityName, srcContinueType); EXPECT_EQ(ret, true); DTEST_LOG << "DMSContinueManagerTest testIsBundleContinuable_002 end" << std::endl; } @@ -1277,7 +1264,6 @@ HWTEST_F(DMSContinueManagerTest, testIsBundleContinuable_003, TestSize.Level1) std::string sinkAbilityName = "sinkAbilityName"; std::string srcContinueType = "srcContinueType"; std::string sinkContinueType = "sinkContinueType"; - bool isSameBundle = false; AppExecFwk::BundleInfo localBundleInfo; std::vector abilityInfos; @@ -1295,8 +1281,7 @@ HWTEST_F(DMSContinueManagerTest, testIsBundleContinuable_003, TestSize.Level1) DTEST_LOG << "GetRecvMgr failed." << std::endl; return; } - bool ret = recvMgr->IsBundleContinuable(localBundleInfo, srcAbilityName, - srcContinueType, isSameBundle); + bool ret = recvMgr->IsBundleContinuable(localBundleInfo, srcAbilityName, srcContinueType); EXPECT_EQ(ret, false); DTEST_LOG << "DMSContinueManagerTest testIsBundleContinuable_002 end" << std::endl; } @@ -1313,7 +1298,6 @@ HWTEST_F(DMSContinueManagerTest, testIsBundleContinuable_004, TestSize.Level1) std::string sinkAbilityName = "sinkAbilityName"; std::string srcContinueType = srcAbilityName; std::string sinkContinueType = "sinkContinueType"; - bool isSameBundle = true; AppExecFwk::BundleInfo localBundleInfo; std::vector abilityInfos; @@ -1331,8 +1315,7 @@ HWTEST_F(DMSContinueManagerTest, testIsBundleContinuable_004, TestSize.Level1) DTEST_LOG << "GetRecvMgr failed." << std::endl; return; } - bool ret = recvMgr->IsBundleContinuable(localBundleInfo, srcAbilityName, - srcContinueType, isSameBundle); + bool ret = recvMgr->IsBundleContinuable(localBundleInfo, srcAbilityName, srcContinueType); EXPECT_EQ(ret, false); DTEST_LOG << "DMSContinueManagerTest testIsBundleContinuable_004 end" << std::endl; } @@ -1349,7 +1332,6 @@ HWTEST_F(DMSContinueManagerTest, testIsBundleContinuable_005, TestSize.Level1) std::string sinkAbilityName = "sinkAbilityName"; std::string srcContinueType = srcAbilityName; std::string sinkContinueType = "sinkContinueType"; - bool isSameBundle = true; AppExecFwk::BundleInfo localBundleInfo; std::vector abilityInfos; @@ -1367,8 +1349,7 @@ HWTEST_F(DMSContinueManagerTest, testIsBundleContinuable_005, TestSize.Level1) DTEST_LOG << "GetRecvMgr failed." << std::endl; return; } - bool ret = recvMgr->IsBundleContinuable(localBundleInfo, srcAbilityName, - srcContinueType, isSameBundle); + bool ret = recvMgr->IsBundleContinuable(localBundleInfo, srcAbilityName, srcContinueType); EXPECT_EQ(ret, true); DTEST_LOG << "DMSContinueManagerTest testIsBundleContinuable_005 end" << std::endl; } From d3a8f3c7f79864a3209c44cd22b3ffa02beba3e7 Mon Sep 17 00:00:00 2001 From: MisterE Date: Thu, 21 Nov 2024 14:19:44 +0800 Subject: [PATCH 08/13] =?UTF-8?q?=E5=BC=82moduleName=E5=8F=AF=E6=8E=A5?= =?UTF-8?q?=E7=BB=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: MisterE --- .../include/continue/dsched_continue.h | 2 +- .../src/continue/dsched_continue.cpp | 22 +++++++++---------- .../continue/dsched_continue_test.cpp | 5 +++-- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/services/dtbschedmgr/include/continue/dsched_continue.h b/services/dtbschedmgr/include/continue/dsched_continue.h index ecf687db..2cea7492 100644 --- a/services/dtbschedmgr/include/continue/dsched_continue.h +++ b/services/dtbschedmgr/include/continue/dsched_continue.h @@ -157,6 +157,7 @@ private: int32_t UpdateElementInfo(std::shared_ptr cmd); void FindSinkContinueAbilityInfo(const std::string &srcModuleName, const std::string &srcContinueType, std::vector &dmsAbilityInfos, std::vector &result); + void ContinueTypeFormat(std::string &continueType); int32_t ExecuteNotifyComplete(int32_t result); int32_t ExecuteContinueEnd(int32_t result); int32_t ExecuteContinueError(int32_t result); @@ -168,7 +169,6 @@ private: uint32_t accessToken); int32_t OnContinueDataCmd(std::shared_ptr cmd); int32_t OnNotifyComplete(int32_t missionId, bool isSuccess); - void ContinueTypeFormat(std::string &continueType); int32_t OnContinueEndCmd(std::shared_ptr cmd); int32_t OnContinueEnd(int32_t result); diff --git a/services/dtbschedmgr/src/continue/dsched_continue.cpp b/services/dtbschedmgr/src/continue/dsched_continue.cpp index 78bb97df..93c92b22 100644 --- a/services/dtbschedmgr/src/continue/dsched_continue.cpp +++ b/services/dtbschedmgr/src/continue/dsched_continue.cpp @@ -421,17 +421,6 @@ int32_t DSchedContinue::OnNotifyComplete(int32_t missionId, bool isSuccess) return ERR_OK; } - - -void DSchedContinue::ContinueTypeFormat(std::string &continueType) -{ - std::string suffix = QUICK_START_CONFIGURATION; - if (suffix.length() <= continueType.length() && - continueType.rfind(suffix) == (continueType.length() - suffix.length())) { - continueType = continueType.substr(0, continueType.rfind(QUICK_START_CONFIGURATION)); - } -} - int32_t DSchedContinue::OnContinueEndCmd(std::shared_ptr cmd) { HILOGI("called"); @@ -1019,7 +1008,7 @@ int32_t DSchedContinue::UpdateElementInfo(std::shared_ptr } void DSchedContinue::FindSinkContinueAbilityInfo(const std::string &srcModuleName, const std::string &srcContinueType, - std::vector &dmsAbilityInfos, std::vector &result) + std::vector &dmsAbilityInfos, std::vector &result) { bool sameModuleGot = false; for (const auto &abilityInfoElement: dmsAbilityInfos) { @@ -1049,6 +1038,15 @@ void DSchedContinue::FindSinkContinueAbilityInfo(const std::string &srcModuleNam } } +void DSchedContinue::ContinueTypeFormat(std::string &continueType) +{ + std::string suffix = QUICK_START_CONFIGURATION; + if (suffix.length() <= continueType.length() && + continueType.rfind(suffix) == (continueType.length() - suffix.length())) { + continueType = continueType.substr(0, continueType.rfind(QUICK_START_CONFIGURATION)); + } +} + int32_t DSchedContinue::UpdateWantForContinueType(OHOS::AAFwk::Want& want) { std::string srcAbilityName = want.GetElement().GetAbilityName(); diff --git a/services/dtbschedmgr/test/unittest/continue/dsched_continue_test.cpp b/services/dtbschedmgr/test/unittest/continue/dsched_continue_test.cpp index cf6f39ee..7ed179ce 100644 --- a/services/dtbschedmgr/test/unittest/continue/dsched_continue_test.cpp +++ b/services/dtbschedmgr/test/unittest/continue/dsched_continue_test.cpp @@ -33,6 +33,7 @@ namespace { const std::string BUNDLEMAME_1 = "bundleName"; const std::string CONTINUE_TYPE1 = "continueType1"; const std::string CONTINUE_TYPE2 = "continueType2"; + const std::string CONTINUE_TYPE3 = "continueType3"; const std::string CONTINUE_TYPE1_QUICK = "continueType1_ContinueQuickStart"; const std::string MODULE_NAME1 = "moduleName1"; const std::string MODULE_NAME2 = "moduleName2"; @@ -628,9 +629,9 @@ HWTEST_F(DSchedContinueTest, DSchedContinueTest_0017_2, TestSize.Level0) auto conti = std::make_shared(subType, direction, callback, info); conti->Init(); auto cmd = std::make_shared(); - // no continueType, diff module + // no same continueType, diff module EXPECT_CALL(*dmsStoreMock, GetLocalDeviceId(_)).WillOnce(Return(true)); - cmd->continueType_ = CONTINUE_TYPE1; + cmd->continueType_ = CONTINUE_TYPE3; cmd->want_.SetElementName("", BUNDLEMAME_1, ABILITY_NAME_SAME_AS_CONTINUE_TYPE, MODULE_NAME2); int32_t ret = conti->UpdateElementInfo(cmd); EXPECT_EQ(ret, CAN_NOT_FOUND_MODULE_ERR); From c98b576ea4d043a580be474bb4e03c8059bb6473 Mon Sep 17 00:00:00 2001 From: MisterE Date: Thu, 21 Nov 2024 14:23:06 +0800 Subject: [PATCH 09/13] =?UTF-8?q?=E5=BC=82moduleName=E5=8F=AF=E6=8E=A5?= =?UTF-8?q?=E7=BB=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: MisterE --- services/dtbschedmgr/src/mission/dms_continue_recv_manager.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/services/dtbschedmgr/src/mission/dms_continue_recv_manager.cpp b/services/dtbschedmgr/src/mission/dms_continue_recv_manager.cpp index fe3dc065..648d382d 100644 --- a/services/dtbschedmgr/src/mission/dms_continue_recv_manager.cpp +++ b/services/dtbschedmgr/src/mission/dms_continue_recv_manager.cpp @@ -333,9 +333,8 @@ int32_t DMSContinueRecvMgr::DealOnBroadcastBusiness(const std::string& senderNet HILOGE("The bundleType must be app, but it is %{public}d", localBundleInfo.applicationInfo.bundleType); return INVALID_PARAMETERS_ERR; } - bool isSameBundle = (bundleName == finalBundleName); if (state == ACTIVE - && !IsBundleContinuable(localBundleInfo, abilityInfo.abilityName, continueType, isSameBundle)) { + && !IsBundleContinuable(localBundleInfo, abilityInfo.abilityName, continueType)) { HILOGE("Bundle %{public}s is not continuable", finalBundleName.c_str()); return BUNDLE_NOT_CONTINUABLE; } From c7d744cabad786673c32e9acf8d331004888d5a6 Mon Sep 17 00:00:00 2001 From: MisterE Date: Thu, 21 Nov 2024 14:34:28 +0800 Subject: [PATCH 10/13] =?UTF-8?q?=E5=BC=82moduleName=E5=8F=AF=E6=8E=A5?= =?UTF-8?q?=E7=BB=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: MisterE --- .../test/unittest/mission/dms_continue_manager_test.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/dtbschedmgr/test/unittest/mission/dms_continue_manager_test.cpp b/services/dtbschedmgr/test/unittest/mission/dms_continue_manager_test.cpp index dbcd4de2..bbf0b8db 100644 --- a/services/dtbschedmgr/test/unittest/mission/dms_continue_manager_test.cpp +++ b/services/dtbschedmgr/test/unittest/mission/dms_continue_manager_test.cpp @@ -1283,7 +1283,7 @@ HWTEST_F(DMSContinueManagerTest, testIsBundleContinuable_003, TestSize.Level1) } bool ret = recvMgr->IsBundleContinuable(localBundleInfo, srcAbilityName, srcContinueType); EXPECT_EQ(ret, false); - DTEST_LOG << "DMSContinueManagerTest testIsBundleContinuable_002 end" << std::endl; + DTEST_LOG << "DMSContinueManagerTest testIsBundleContinuable_003 end" << std::endl; } /** @@ -1327,7 +1327,7 @@ HWTEST_F(DMSContinueManagerTest, testIsBundleContinuable_004, TestSize.Level1) */ HWTEST_F(DMSContinueManagerTest, testIsBundleContinuable_005, TestSize.Level1) { - DTEST_LOG << "DMSContinueManagerTest testIsBundleContinuable_004 start" << std::endl; + DTEST_LOG << "DMSContinueManagerTest testIsBundleContinuable_005 start" << std::endl; std::string srcAbilityName = "srcAbilityName"; std::string sinkAbilityName = "sinkAbilityName"; std::string srcContinueType = srcAbilityName; From f442b43626cbcc3f142d741c8980ee494bfce564 Mon Sep 17 00:00:00 2001 From: MisterE Date: Thu, 21 Nov 2024 16:34:00 +0800 Subject: [PATCH 11/13] =?UTF-8?q?=E5=BC=82moduleName=E5=8F=AF=E6=8E=A5?= =?UTF-8?q?=E7=BB=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: MisterE --- .../test/unittest/mission/dms_continue_manager_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/dtbschedmgr/test/unittest/mission/dms_continue_manager_test.cpp b/services/dtbschedmgr/test/unittest/mission/dms_continue_manager_test.cpp index bbf0b8db..7bdb2ef9 100644 --- a/services/dtbschedmgr/test/unittest/mission/dms_continue_manager_test.cpp +++ b/services/dtbschedmgr/test/unittest/mission/dms_continue_manager_test.cpp @@ -1350,7 +1350,7 @@ HWTEST_F(DMSContinueManagerTest, testIsBundleContinuable_005, TestSize.Level1) return; } bool ret = recvMgr->IsBundleContinuable(localBundleInfo, srcAbilityName, srcContinueType); - EXPECT_EQ(ret, true); + EXPECT_EQ(ret, false); DTEST_LOG << "DMSContinueManagerTest testIsBundleContinuable_005 end" << std::endl; } From 5b36f467b16361ab844e3945d08c7c635a8a687c Mon Sep 17 00:00:00 2001 From: MisterE Date: Thu, 21 Nov 2024 16:56:37 +0800 Subject: [PATCH 12/13] =?UTF-8?q?=E5=BC=82moduleName=E5=8F=AF=E6=8E=A5?= =?UTF-8?q?=E7=BB=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: MisterE --- services/dtbschedmgr/src/continue/dsched_continue.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/dtbschedmgr/src/continue/dsched_continue.cpp b/services/dtbschedmgr/src/continue/dsched_continue.cpp index 93c92b22..caaf24e3 100644 --- a/services/dtbschedmgr/src/continue/dsched_continue.cpp +++ b/services/dtbschedmgr/src/continue/dsched_continue.cpp @@ -983,7 +983,7 @@ int32_t DSchedContinue::UpdateElementInfo(std::shared_ptr DmsBundleInfo distributedBundleInfo; std::string localDeviceId; if (!GetLocalDeviceId(localDeviceId) || !DmsBmStorage::GetInstance()->GetDistributedBundleInfo( - localDeviceId, cmd->dstBundleName_, distributedBundleInfo)) { + localDeviceId, cmd->dstBundleName_, distributedBundleInfo)) { HILOGE("UpdateElementInfo can not found bundle info for bundle name: %{public}s", cmd->dstBundleName_.c_str()); return CAN_NOT_FOUND_MODULE_ERR; From cb74143f43b6cc313dbfc04781f509006921fa69 Mon Sep 17 00:00:00 2001 From: MisterE Date: Fri, 22 Nov 2024 15:13:05 +0800 Subject: [PATCH 13/13] =?UTF-8?q?=E5=BC=82moduleName=E5=8F=AF=E6=8E=A5?= =?UTF-8?q?=E7=BB=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: MisterE --- common/include/dtbschedmgr_log.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/include/dtbschedmgr_log.h b/common/include/dtbschedmgr_log.h index adfc9a82..0724d705 100644 --- a/common/include/dtbschedmgr_log.h +++ b/common/include/dtbschedmgr_log.h @@ -528,7 +528,7 @@ enum { /** * Result(29360238) for BMS can not find the specified module. */ - CAN_NOT_FOUND_MODULE_ERR = 29360238, + CAN_NOT_FOUND_MODULE_ERR = 29360239, }; } // namespace DistributedSchedule } // namespace OHOS