From 3aa0efcdb6ecd3dd3e5e890f0d9d39e928f20c51 Mon Sep 17 00:00:00 2001 From: wang19954 Date: Tue, 9 Sep 2025 15:04:44 +0800 Subject: [PATCH 1/2] IssueNo:#ICX4BQ Description:fix spelling bug Sig:SIG_ApplicaitonFramework Feature or Bugfix:Bugfix Binary Source:No Signed-off-by: wangtiantian --- services/bundlemgr/include/bundle_data_mgr.h | 2 +- .../extend_resource_manager_host_impl.h | 2 +- services/bundlemgr/src/bundle_data_mgr.cpp | 2 +- .../extend_resource_manager_host_impl.cpp | 6 +++--- .../unittest/bms_data_mgr_test/bms_data_mgr_test.cpp | 10 +++++----- .../bms_extend_resource_manager_test.cpp | 4 ++-- .../processaddextresource_fuzzer.cpp | 2 +- .../updateextresourcesdb_fuzzer.cpp | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/services/bundlemgr/include/bundle_data_mgr.h b/services/bundlemgr/include/bundle_data_mgr.h index f473cfd14d..5916b13a17 100644 --- a/services/bundlemgr/include/bundle_data_mgr.h +++ b/services/bundlemgr/include/bundle_data_mgr.h @@ -789,7 +789,7 @@ public: bool ImplicitQueryInfos(const Want &want, int32_t flags, int32_t userId, bool withDefault, std::vector &abilityInfos, std::vector &extensionInfos, bool &findDefaultApp); - bool UpateExtResources(const std::string &bundleName, + bool UpdateExtResources(const std::string &bundleName, const std::vector &extendResourceInfos); bool RemoveExtResources(const std::string &bundleName, const std::vector &moduleNames); diff --git a/services/bundlemgr/include/extend_resource/extend_resource_manager_host_impl.h b/services/bundlemgr/include/extend_resource/extend_resource_manager_host_impl.h index ca5748b6f5..c2efed2fbb 100644 --- a/services/bundlemgr/include/extend_resource/extend_resource_manager_host_impl.h +++ b/services/bundlemgr/include/extend_resource/extend_resource_manager_host_impl.h @@ -67,7 +67,7 @@ private: const std::string &bundleName, const std::vector &filePaths, std::vector &extendResourceInfos); - bool UpateExtResourcesDb(const std::string &bundleName, + bool UpdateExtResourcesDb(const std::string &bundleName, const std::vector &extendResourceInfos); bool RemoveExtResourcesDb( const std::string &bundleName, const std::vector &moduleNames); diff --git a/services/bundlemgr/src/bundle_data_mgr.cpp b/services/bundlemgr/src/bundle_data_mgr.cpp index ba58194c3c..63deb31ae4 100644 --- a/services/bundlemgr/src/bundle_data_mgr.cpp +++ b/services/bundlemgr/src/bundle_data_mgr.cpp @@ -2677,7 +2677,7 @@ bool BundleDataMgr::GetApplicationInfos( return !appInfos.empty(); } -bool BundleDataMgr::UpateExtResources(const std::string &bundleName, +bool BundleDataMgr::UpdateExtResources(const std::string &bundleName, const std::vector &extendResourceInfos) { if (bundleName.empty()) { diff --git a/services/bundlemgr/src/extend_resource/extend_resource_manager_host_impl.cpp b/services/bundlemgr/src/extend_resource/extend_resource_manager_host_impl.cpp index e2afc24c52..9cfd8c172a 100644 --- a/services/bundlemgr/src/extend_resource/extend_resource_manager_host_impl.cpp +++ b/services/bundlemgr/src/extend_resource/extend_resource_manager_host_impl.cpp @@ -203,7 +203,7 @@ void ExtendResourceManagerHostImpl::InnerSaveExtendResourceInfo( newExtendResourceInfos.emplace_back(extendResourceInfos[i]); } - UpateExtResourcesDb(bundleName, newExtendResourceInfos); + UpdateExtResourcesDb(bundleName, newExtendResourceInfos); } ErrCode ExtendResourceManagerHostImpl::ParseExtendResourceFile( @@ -286,7 +286,7 @@ bool ExtendResourceManagerHostImpl::GetInnerBundleInfo( return dataMgr->FetchInnerBundleInfo(bundleName, info); } -bool ExtendResourceManagerHostImpl::UpateExtResourcesDb(const std::string &bundleName, +bool ExtendResourceManagerHostImpl::UpdateExtResourcesDb(const std::string &bundleName, const std::vector &extendResourceInfos) { auto dataMgr = DelayedSingleton::GetInstance()->GetDataMgr(); @@ -294,7 +294,7 @@ bool ExtendResourceManagerHostImpl::UpateExtResourcesDb(const std::string &bundl APP_LOGE("Get dataMgr shared_ptr nullptr"); return false; } - return dataMgr->UpateExtResources(bundleName, extendResourceInfos); + return dataMgr->UpdateExtResources(bundleName, extendResourceInfos); } bool ExtendResourceManagerHostImpl::RemoveExtResourcesDb(const std::string &bundleName, diff --git a/services/bundlemgr/test/unittest/bms_data_mgr_test/bms_data_mgr_test.cpp b/services/bundlemgr/test/unittest/bms_data_mgr_test/bms_data_mgr_test.cpp index a4f58c4796..5e6dc307b3 100644 --- a/services/bundlemgr/test/unittest/bms_data_mgr_test/bms_data_mgr_test.cpp +++ b/services/bundlemgr/test/unittest/bms_data_mgr_test/bms_data_mgr_test.cpp @@ -2249,24 +2249,24 @@ HWTEST_F(BmsDataMgrTest, ModifyApplicationInfoByCloneInfo_0100, Function | Small } /** - * @tc.number: UpateExtResources_0100 - * @tc.name: test UpateExtResources + * @tc.number: UpdateExtResources_0100 + * @tc.name: test UpdateExtResources * @tc.desc: 1.test update external resources */ -HWTEST_F(BmsDataMgrTest, UpateExtResources_0100, Function | SmallTest | Level1) +HWTEST_F(BmsDataMgrTest, UpdateExtResources_0100, Function | SmallTest | Level1) { auto dataMgr = GetDataMgr(); ASSERT_NE(dataMgr, nullptr); std::string bundleName = ""; std::vector extendResourceInfos; - bool ret = dataMgr->UpateExtResources(bundleName, extendResourceInfos); + bool ret = dataMgr->UpdateExtResources(bundleName, extendResourceInfos); EXPECT_EQ(ret, false); std::map infos; InnerBundleInfo innerBundleInfo; infos.emplace(BUNDLE_NAME, innerBundleInfo); dataMgr->bundleInfos_.swap(infos); - ret = dataMgr->UpateExtResources(BUNDLE_NAME, extendResourceInfos); + ret = dataMgr->UpdateExtResources(BUNDLE_NAME, extendResourceInfos); EXPECT_EQ(ret, true); } diff --git a/services/bundlemgr/test/unittest/bms_extend_resource_manager_test/bms_extend_resource_manager_test.cpp b/services/bundlemgr/test/unittest/bms_extend_resource_manager_test/bms_extend_resource_manager_test.cpp index 7bf8faa17e..5d942472da 100644 --- a/services/bundlemgr/test/unittest/bms_extend_resource_manager_test/bms_extend_resource_manager_test.cpp +++ b/services/bundlemgr/test/unittest/bms_extend_resource_manager_test/bms_extend_resource_manager_test.cpp @@ -374,7 +374,7 @@ HWTEST_F(BmsExtendResourceManagerTest, ExtResourceTest_1000, Function | SmallTes EXPECT_EQ(ret, ERR_APPEXECFWK_INSTALLD_GET_PROXY_ERROR); std::vector extendResourceInfos; - ret = impl.UpateExtResourcesDb(BUNDLE_NAME, extendResourceInfos); + ret = impl.UpdateExtResourcesDb(BUNDLE_NAME, extendResourceInfos); EXPECT_EQ(ret, false); } @@ -1273,7 +1273,7 @@ HWTEST_F(BmsExtendResourceManagerTest, ExtResourceTest_1001, Function | SmallTes }; auto ret = impl.CopyToTempDir(BUNDLE_NAME, oldFilePaths, newFilePaths); std::vector extendResourceInfos; - ret = impl.UpateExtResourcesDb(BUNDLE_NAME, extendResourceInfos); + ret = impl.UpdateExtResourcesDb(BUNDLE_NAME, extendResourceInfos); EXPECT_TRUE(ret); } diff --git a/test/fuzztest/fuzztest_others/processaddextresource_fuzzer/processaddextresource_fuzzer.cpp b/test/fuzztest/fuzztest_others/processaddextresource_fuzzer/processaddextresource_fuzzer.cpp index aad3a39ce6..8f03f73751 100644 --- a/test/fuzztest/fuzztest_others/processaddextresource_fuzzer/processaddextresource_fuzzer.cpp +++ b/test/fuzztest/fuzztest_others/processaddextresource_fuzzer/processaddextresource_fuzzer.cpp @@ -29,7 +29,7 @@ namespace { auto ret = impl.ProcessAddExtResource(TEST_BUNDLE, filePaths); std::vector extendResourceInfos; impl.InnerSaveExtendResourceInfo(TEST_BUNDLE, filePaths, extendResourceInfos); - impl.UpateExtResourcesDb(TEST_BUNDLE, extendResourceInfos); + impl.UpdateExtResourcesDb(TEST_BUNDLE, extendResourceInfos); std::vector moduleNames; impl.RemoveExtResourcesDb(TEST_BUNDLE, moduleNames); impl.InnerRemoveExtendResources(TEST_BUNDLE, moduleNames, extendResourceInfos); diff --git a/test/fuzztest/fuzztest_others/updateextresourcesdb_fuzzer/updateextresourcesdb_fuzzer.cpp b/test/fuzztest/fuzztest_others/updateextresourcesdb_fuzzer/updateextresourcesdb_fuzzer.cpp index 872ee73281..853a6e13d6 100644 --- a/test/fuzztest/fuzztest_others/updateextresourcesdb_fuzzer/updateextresourcesdb_fuzzer.cpp +++ b/test/fuzztest/fuzztest_others/updateextresourcesdb_fuzzer/updateextresourcesdb_fuzzer.cpp @@ -36,7 +36,7 @@ namespace { return false; } std::vector extendResourceInfos; - ret = impl.UpateExtResourcesDb(BUNDLE_NAME, extendResourceInfos); + ret = impl.UpdateExtResourcesDb(BUNDLE_NAME, extendResourceInfos); return ret; } } -- Gitee From 85f1ccda2652879371d79fa4f0fd0cca3b8d4717 Mon Sep 17 00:00:00 2001 From: wang19954 Date: Tue, 9 Sep 2025 15:27:48 +0800 Subject: [PATCH 2/2] IssueNo:#ICX4BQ Description:fix rdb bug Sig:SIG_ApplicaitonFramework Feature or Bugfix:Bugfix Binary Source:No Signed-off-by: wangtiantian --- .../extend_resource_manager_host_impl.h | 2 +- .../extend_resource_manager_host_impl.cpp | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/services/bundlemgr/include/extend_resource/extend_resource_manager_host_impl.h b/services/bundlemgr/include/extend_resource/extend_resource_manager_host_impl.h index c2efed2fbb..5667329813 100644 --- a/services/bundlemgr/include/extend_resource/extend_resource_manager_host_impl.h +++ b/services/bundlemgr/include/extend_resource/extend_resource_manager_host_impl.h @@ -71,7 +71,7 @@ private: const std::vector &extendResourceInfos); bool RemoveExtResourcesDb( const std::string &bundleName, const std::vector &moduleNames); - void InnerSaveExtendResourceInfo( + bool InnerSaveExtendResourceInfo( const std::string &bundleName, const std::vector &filePaths, const std::vector &extendResourceInfos); ErrCode CheckModuleExist( diff --git a/services/bundlemgr/src/extend_resource/extend_resource_manager_host_impl.cpp b/services/bundlemgr/src/extend_resource/extend_resource_manager_host_impl.cpp index 9cfd8c172a..2a00a17b9c 100644 --- a/services/bundlemgr/src/extend_resource/extend_resource_manager_host_impl.cpp +++ b/services/bundlemgr/src/extend_resource/extend_resource_manager_host_impl.cpp @@ -181,11 +181,15 @@ ErrCode ExtendResourceManagerHostImpl::ProcessAddExtResource( return ERR_EXT_RESOURCE_MANAGER_PARSE_FILE_FAILED; } - InnerSaveExtendResourceInfo(bundleName, newFilePaths, extendResourceInfos); + if (!InnerSaveExtendResourceInfo(bundleName, newFilePaths, extendResourceInfos)) { + APP_LOGE("save %{public}s extendResource failed", bundleName.c_str()); + RollBack(newFilePaths); + return ERR_EXT_RESOURCE_MANAGER_PARSE_FILE_FAILED; + } return ERR_OK; } -void ExtendResourceManagerHostImpl::InnerSaveExtendResourceInfo( +bool ExtendResourceManagerHostImpl::InnerSaveExtendResourceInfo( const std::string &bundleName, const std::vector &filePaths, const std::vector &extendResourceInfos) @@ -203,7 +207,7 @@ void ExtendResourceManagerHostImpl::InnerSaveExtendResourceInfo( newExtendResourceInfos.emplace_back(extendResourceInfos[i]); } - UpdateExtResourcesDb(bundleName, newExtendResourceInfos); + return UpdateExtResourcesDb(bundleName, newExtendResourceInfos); } ErrCode ExtendResourceManagerHostImpl::ParseExtendResourceFile( -- Gitee