diff --git a/services/bundlemgr/src/bundle_data_mgr.cpp b/services/bundlemgr/src/bundle_data_mgr.cpp index c494ae8a2..9e88824b2 100644 --- a/services/bundlemgr/src/bundle_data_mgr.cpp +++ b/services/bundlemgr/src/bundle_data_mgr.cpp @@ -3981,8 +3981,7 @@ bool BundleDataMgr::GetInnerBundleInfoWithFlags(const std::string &bundleName, return false; } const InnerBundleInfo &innerBundleInfo = item->second; - auto mark = innerBundleInfo.GetInstallMark(); - if (innerBundleInfo.IsDisabled() || mark.status != InstallExceptionStatus::INSTALL_FINISH) { + if (innerBundleInfo.IsDisabled()) { APP_LOGD("bundleName: %{public}s status is disabled", innerBundleInfo.GetBundleName().c_str()); return false; } @@ -4063,8 +4062,7 @@ ErrCode BundleDataMgr::GetInnerBundleInfoWithFlagsV9(const std::string &bundleNa return ERR_BUNDLE_MANAGER_BUNDLE_NOT_EXIST; } const InnerBundleInfo &innerBundleInfo = item->second; - auto mark = innerBundleInfo.GetInstallMark(); - if (innerBundleInfo.IsDisabled() || mark.status != InstallExceptionStatus::INSTALL_FINISH) { + if (innerBundleInfo.IsDisabled()) { APP_LOGD("bundleName: %{public}s status is disabled", innerBundleInfo.GetBundleName().c_str()); return ERR_BUNDLE_MANAGER_BUNDLE_NOT_EXIST; } @@ -4107,8 +4105,7 @@ ErrCode BundleDataMgr::GetInnerBundleInfoWithBundleFlagsV9(const std::string &bu return ERR_BUNDLE_MANAGER_BUNDLE_NOT_EXIST; } const InnerBundleInfo &innerBundleInfo = item->second; - auto mark = innerBundleInfo.GetInstallMark(); - if (innerBundleInfo.IsDisabled() || mark.status != InstallExceptionStatus::INSTALL_FINISH) { + if (innerBundleInfo.IsDisabled()) { APP_LOGW("bundleName: %{public}s status is disabled", innerBundleInfo.GetBundleName().c_str()); return ERR_BUNDLE_MANAGER_INTERNAL_ERROR; } diff --git a/services/bundlemgr/test/unittest/bms_bundle_default_app_test/bms_bundle_default_app_mgr_test.cpp b/services/bundlemgr/test/unittest/bms_bundle_default_app_test/bms_bundle_default_app_mgr_test.cpp index 467f64de1..79747f5ab 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_default_app_test/bms_bundle_default_app_mgr_test.cpp +++ b/services/bundlemgr/test/unittest/bms_bundle_default_app_test/bms_bundle_default_app_mgr_test.cpp @@ -127,7 +127,6 @@ void BmsBundleDefaultAppMgrTest::AddInnerBundleInfo(const std::string bundleName innerBundleInfo.AddInnerModuleInfo(innerModuleInfoMap); innerBundleInfo.AddModuleAbilityInfo(innerAbilityMap); innerBundleInfo.AddInnerBundleUserInfo(innerBundleUserInfo); - innerBundleInfo.SetInstallMark(bundleName, MODULE_NAME, InstallExceptionStatus::INSTALL_FINISH); Skill skill; SkillUri uri; diff --git a/services/bundlemgr/test/unittest/bms_bundle_free_install_test/bms_bundle_free_install_test.cpp b/services/bundlemgr/test/unittest/bms_bundle_free_install_test/bms_bundle_free_install_test.cpp index 17fcaf8ba..c223601ea 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_free_install_test/bms_bundle_free_install_test.cpp +++ b/services/bundlemgr/test/unittest/bms_bundle_free_install_test/bms_bundle_free_install_test.cpp @@ -209,8 +209,6 @@ void BmsBundleFreeInstallTest::AddInnerBundleInfo(const std::string bundleName, innerBundleInfo.AddInnerBundleUserInfo(userInfo); innerBundleInfo.SetBundlePackInfo(CreateBundlePackInfo(bundleName)); innerBundleInfo.AddInnerModuleInfo(innerModuleInfoMap); - std::string packageName; - innerBundleInfo.SetInstallMark(bundleName, packageName, InstallExceptionStatus::INSTALL_FINISH); if (flag) { innerBundleInfo.SetApplicationBundleType(BundleType::ATOMIC_SERVICE); diff --git a/services/bundlemgr/test/unittest/bms_bundle_kit_service_base_test/bms_bundle_kit_service_base_test.cpp b/services/bundlemgr/test/unittest/bms_bundle_kit_service_base_test/bms_bundle_kit_service_base_test.cpp index 81f598b80..a98bf0c90 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_kit_service_base_test/bms_bundle_kit_service_base_test.cpp +++ b/services/bundlemgr/test/unittest/bms_bundle_kit_service_base_test/bms_bundle_kit_service_base_test.cpp @@ -166,8 +166,6 @@ void BmsBundleKitServiceBaseTest::MockInstallBundle( InnerBundleInfo innerBundleInfo; innerBundleInfo.InsertAbilitiesInfo(keyName, abilityInfo); innerBundleInfo.InsertInnerModuleInfo(moduleName, moduleInfo); - std::string packageName; - innerBundleInfo.SetInstallMark(bundleName, packageName, InstallExceptionStatus::INSTALL_FINISH); Skill skill; skill.actions = {ACTION}; skill.entities = {ENTITY}; diff --git a/services/bundlemgr/test/unittest/bms_bundle_kit_service_test/bms_bundle_kit_service_test.cpp b/services/bundlemgr/test/unittest/bms_bundle_kit_service_test/bms_bundle_kit_service_test.cpp index d39a0ee8d..645a73404 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_kit_service_test/bms_bundle_kit_service_test.cpp +++ b/services/bundlemgr/test/unittest/bms_bundle_kit_service_test/bms_bundle_kit_service_test.cpp @@ -626,8 +626,6 @@ void BmsBundleKitServiceTest::AddInnerBundleInfoByTest(const std::string &bundle std::string commonEventKey = bundleName + moduleName + abilityName; CommonEventInfo eventInfo = MockCommonEventInfo(bundleName, innerBundleInfo.GetUid(DEFAULT_USERID)); innerBundleInfo.InsertCommonEvents(commonEventKey, eventInfo); - std::string packageName; - innerBundleInfo.SetInstallMark(bundleName, packageName, InstallExceptionStatus::INSTALL_FINISH); } void BmsBundleKitServiceTest::MockInstallBundle( @@ -641,8 +639,6 @@ void BmsBundleKitServiceTest::MockInstallBundle( InnerBundleInfo innerBundleInfo; innerBundleInfo.InsertAbilitiesInfo(keyName, abilityInfo); innerBundleInfo.InsertInnerModuleInfo(moduleName, moduleInfo); - std::string packageName; - innerBundleInfo.SetInstallMark(bundleName, packageName, InstallExceptionStatus::INSTALL_FINISH); Skill skill; skill.actions = {ACTION}; skill.entities = {ENTITY}; @@ -664,8 +660,6 @@ void BmsBundleKitServiceTest::MockInstallExtension(const std::string &bundleName innerBundleInfo.InsertExtensionInfo(keyName, extensionInfo); innerBundleInfo.InsertExtensionInfo(keyName02, extensionInfo02); innerBundleInfo.InsertInnerModuleInfo(moduleName, moduleInfo); - std::string packageName; - innerBundleInfo.SetInstallMark(bundleName, packageName, InstallExceptionStatus::INSTALL_FINISH); Skill skill; skill.actions = {ACTION}; skill.entities = {ENTITY}; @@ -688,8 +682,6 @@ void BmsBundleKitServiceTest::MockInstallExtensionWithUri(const std::string &bun innerBundleInfo.InsertExtensionInfo(keyName, extensionInfo); innerBundleInfo.InsertExtensionInfo(keyName02, extensionInfo02); innerBundleInfo.InsertInnerModuleInfo(moduleName, moduleInfo); - std::string packageName; - innerBundleInfo.SetInstallMark(bundleName, packageName, InstallExceptionStatus::INSTALL_FINISH); Skill skill = MockExtensionSkillInfo(); std::vector skills; skills.emplace_back(skill); @@ -777,8 +769,6 @@ void BmsBundleKitServiceTest::MockInstallBundle( AbilityInfo abilityInfo = MockAbilityInfo(bundleName, moduleName, abilityName); innerBundleInfo.InsertAbilitiesInfo(keyName, abilityInfo); innerBundleInfo.InsertInnerModuleInfo(moduleName, moduleInfo); - std::string packageName; - innerBundleInfo.SetInstallMark(bundleName, packageName, InstallExceptionStatus::INSTALL_FINISH); Skill skill; skill.actions = {ACTION}; skill.entities = {ENTITY}; @@ -1021,8 +1011,6 @@ void BmsBundleKitServiceTest::MockInnerBundleInfo(const std::string &bundleName, std::string keyName = bundleName + "." + moduleName + "." + abilityName; innerBundleInfo.InsertAbilitiesInfo(keyName, abilityInfo); innerBundleInfo.SetBaseApplicationInfo(appInfo); - std::string packageName; - innerBundleInfo.SetInstallMark(bundleName, packageName, InstallExceptionStatus::INSTALL_FINISH); } void BmsBundleKitServiceTest::CheckBundleInfo(const std::string &bundleName, const std::string &moduleName, @@ -9243,7 +9231,6 @@ HWTEST_F(BmsBundleKitServiceTest, CleanBundleCacheFilesGetCleanSize_0100, Functi auto dataMgr = DelayedSingleton::GetInstance()->GetDataMgr(); ASSERT_NE(dataMgr, nullptr); InnerBundleInfo innerBundleInfo; - innerBundleInfo.SetInstallMark(BUNDLE_NAME_DEMO, "", InstallExceptionStatus::INSTALL_FINISH); std::map innerBundleUserInfos; InnerBundleUserInfo info; info.bundleUserInfo.userId = DEFAULT_USERID; diff --git a/services/bundlemgr/test/unittest/bms_bundle_quick_fix_query_test/bms_bundle_quick_fix_query_test.cpp b/services/bundlemgr/test/unittest/bms_bundle_quick_fix_query_test/bms_bundle_quick_fix_query_test.cpp index 8eb058e5d..0e8475d0a 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_quick_fix_query_test/bms_bundle_quick_fix_query_test.cpp +++ b/services/bundlemgr/test/unittest/bms_bundle_quick_fix_query_test/bms_bundle_quick_fix_query_test.cpp @@ -148,8 +148,6 @@ void BmsBundleQuickFixQueryTest::MockInstallBundleInfo() innerBundleInfo.SetBaseBundleInfo(bundleInfo); innerBundleInfo.SetBaseApplicationInfo(applicationInfo); innerBundleInfo.AddInnerBundleUserInfo(userInfo); - std::string packageName; - innerBundleInfo.SetInstallMark(BUNDLE_NAME, packageName, InstallExceptionStatus::INSTALL_FINISH); auto dataMgr = GetBundleDataMgr(); EXPECT_NE(dataMgr, nullptr); diff --git a/services/bundlemgr/test/unittest/bms_bundle_quick_fix_test/bms_bundle_quick_fix_test.cpp b/services/bundlemgr/test/unittest/bms_bundle_quick_fix_test/bms_bundle_quick_fix_test.cpp index 606ccbbc8..03bf8fa42 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_quick_fix_test/bms_bundle_quick_fix_test.cpp +++ b/services/bundlemgr/test/unittest/bms_bundle_quick_fix_test/bms_bundle_quick_fix_test.cpp @@ -281,8 +281,6 @@ void BmsBundleQuickFixTest::AddInnerBundleInfo(const std::string bundleName, innerBundleInfo.SetBaseApplicationInfo(applicationInfo); innerBundleInfo.AddInnerBundleUserInfo(userInfo); innerBundleInfo.InsertInnerModuleInfo(bundleName, moduleInfo); - std::string packageName; - innerBundleInfo.SetInstallMark(bundleName, packageName, InstallExceptionStatus::INSTALL_FINISH); auto dataMgr = GetBundleDataMgr(); EXPECT_NE(dataMgr, nullptr); diff --git a/services/bundlemgr/test/unittest/bms_bundle_sandbox_app_test/bms_bundle_sandbox_app_test.cpp b/services/bundlemgr/test/unittest/bms_bundle_sandbox_app_test/bms_bundle_sandbox_app_test.cpp index 4bcc45488..3a8e7e428 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_sandbox_app_test/bms_bundle_sandbox_app_test.cpp +++ b/services/bundlemgr/test/unittest/bms_bundle_sandbox_app_test/bms_bundle_sandbox_app_test.cpp @@ -2193,8 +2193,6 @@ HWTEST_F(BmsSandboxAppTest, GetBundleInfoForSelf_0100, Function | SmallTest | Le InnerBundleInfo info; info.SetBaseApplicationInfo(appInfo); info.AddInnerBundleUserInfo(innerUserInfo); - std::string packageName; - info.SetInstallMark(BUNDLE_NAME_TEST, packageName, InstallExceptionStatus::INSTALL_FINISH); SaveSandboxAppInfo(info, APP_INDEX_1); 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 537a453f0..39980f175 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 @@ -574,20 +574,19 @@ HWTEST_F(BmsDataMgrTest, AddBundleInfo_0200, Function | SmallTest | Level0) info1.SetBaseBundleInfo(bundleInfo1); info1.SetBaseApplicationInfo(applicationInfo1); info1.AddInnerBundleUserInfo(innerBundleUserInfo); - info1.SetInstallMark(BUNDLE_NAME, "", InstallExceptionStatus::INSTALL_FINISH); InnerBundleInfo info2; BundleInfo bundleInfo2; bundleInfo2.name = BUNDLE_NAME; bundleInfo2.applicationInfo.name = APP_NAME; bundleInfo2.applicationInfo.bundleName = BUNDLE_NAME; - applicationInfo1.name = BUNDLE_NAME; - applicationInfo1.bundleName = BUNDLE_NAME; - applicationInfo1.deviceId = DEVICE_ID; + ApplicationInfo applicationInfo2; + applicationInfo2.name = BUNDLE_NAME; + applicationInfo2.bundleName = BUNDLE_NAME; + applicationInfo2.deviceId = DEVICE_ID; info2.SetBaseBundleInfo(bundleInfo2); - info2.SetBaseApplicationInfo(applicationInfo1); + info2.SetBaseApplicationInfo(applicationInfo2); info2.AddInnerBundleUserInfo(innerBundleUserInfo); - info2.SetInstallMark(BUNDLE_NAME, "", InstallExceptionStatus::INSTALL_FINISH); auto dataMgr = GetDataMgr(); EXPECT_NE(dataMgr, nullptr); @@ -880,8 +879,6 @@ HWTEST_F(BmsDataMgrTest, QueryAbilityInfo_0100, Function | SmallTest | Level0) info1.InsertAbilitiesInfo(BUNDLE_NAME + PACKAGE_NAME + ABILITY_NAME, abilityInfo); info1.AddInnerBundleUserInfo(innerBundleUserInfo); info1.SetAbilityEnabled(Constants::EMPTY_STRING, ABILITY_NAME, true, USERID); - std::string packageName; - info1.SetInstallMark(BUNDLE_NAME, packageName, InstallExceptionStatus::INSTALL_FINISH); auto dataMgr = GetDataMgr(); EXPECT_NE(dataMgr, nullptr); dataMgr->AddUserId(USERID); @@ -1008,8 +1005,6 @@ HWTEST_F(BmsDataMgrTest, GetApplicationInfo_0100, Function | SmallTest | Level0) info1.SetBaseBundleInfo(bundleInfo1); info1.SetBaseApplicationInfo(applicationInfo1); info1.AddInnerBundleUserInfo(innerBundleUserInfo); - std::string packageName; - info1.SetInstallMark(BUNDLE_NAME, packageName, InstallExceptionStatus::INSTALL_FINISH); auto dataMgr = GetDataMgr(); EXPECT_NE(dataMgr, nullptr); @@ -2465,8 +2460,6 @@ HWTEST_F(BmsDataMgrTest, QueryAbilityInfoByContinueType_0200, Function | SmallTe applicationInfo.bundleName = BUNDLE_NAME; InnerBundleInfo innerBundleInfo; innerBundleInfo.SetBaseApplicationInfo(applicationInfo); - std::string packageName; - innerBundleInfo.SetInstallMark(BUNDLE_NAME, packageName, InstallExceptionStatus::INSTALL_FINISH); int32_t userId = Constants::ALL_USERID; BundleUserInfo userInfo; userInfo.userId = userId; @@ -2564,8 +2557,6 @@ HWTEST_F(BmsDataMgrTest, GetInnerBundleInfoWithFlags_0100, Function | SmallTest InnerBundleUserInfo innerBundleUserInfo; innerBundleUserInfo.bundleUserInfo = userInfo; innerBundleInfo.AddInnerBundleUserInfo(innerBundleUserInfo); - std::string packageName; - innerBundleInfo.SetInstallMark(BUNDLE_NAME, packageName, InstallExceptionStatus::INSTALL_FINISH); dataMgr->multiUserIdsSet_.insert(userId); dataMgr->bundleInfos_.emplace(BUNDLE_NAME, innerBundleInfo); ErrCode res =