openharmony/bundlemanager_bundle_framework
1
0
Fork 0
mirror of https://gitee.com/openharmony/bundlemanager_bundle_framework synced 2024-11-27 01:11:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix getBundleInfo in BundleMgrClient

Browse Source 
Signed-off-by: shilei <shilei91@huawei.com>
Change-Id: Ibe660ff3cd10a98f2c8dabe1d4244b34aeea6f93
Signed-off-by: shilei <shilei91@huawei.com>
This commit is contained in:
shilei 2022-01-26 09:40:30 +00:00
parent f0535df4c9
commit 41c772f82c
6 changed files with 45 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
interfaces/innerkits/appexecfwk_core/include/bundlemgr/bundle_mgr_client.h
View File

@ -16,6 +16,7 @@
#ifndef FOUNDATION_APPEXECFWK_INTERFACES_INNERKITS_APPEXECFWK_CORE_INCLUDE_BUNDLEMGR_BUNDLE_MGR_CLIENT_H
#define FOUNDATION_APPEXECFWK_INTERFACES_INNERKITS_APPEXECFWK_CORE_INCLUDE_BUNDLEMGR_BUNDLE_MGR_CLIENT_H
#include "bundle_constants.h"
#include "bundle_info.h"
#include "extension_ability_info.h"
#include "hap_module_info.h"
@ -30,7 +31,8 @@ public:
virtual ~BundleMgrClient();
bool GetBundleNameForUid(const int uid, std::string &bundleName);
bool GetBundleInfo(const std::string &bundleName, const BundleFlag flag, BundleInfo &bundleInfo);
bool GetBundleInfo(const std::string &bundleName, const BundleFlag flag, BundleInfo &bundleInfo,
int32_t userId = Constants::UNSPECIFIED_USERID);
/**
* @brief Obtain the profile which are deploied in the Metadata in the bundle.

2
interfaces/innerkits/appexecfwk_core/include/bundlemgr/bundle_mgr_client_impl.h
View File

@ -32,7 +32,7 @@ public:
virtual ~BundleMgrClientImpl();
bool GetBundleNameForUid(const int uid, std::string &bundleName);
bool GetBundleInfo(const std::string &bundleName, const BundleFlag flag, BundleInfo &bundleInfo);
bool GetBundleInfo(const std::string &bundleName, const BundleFlag flag, BundleInfo &bundleInfo, int32_t userId);
bool GetHapModuleInfo(const std::string &bundleName, const std::string &hapName, HapModuleInfo &hapModuleInfo);
bool GetResConfigFile(const HapModuleInfo &hapModuleInfo, const std::string &metadataName,
std::vector<std::string> &profileInfos) const;

5
interfaces/innerkits/appexecfwk_core/src/bundlemgr/bundle_mgr_client.cpp
View File

@ -38,9 +38,10 @@ bool BundleMgrClient::GetBundleNameForUid(const int uid, std::string &bundleName
return impl_->GetBundleNameForUid(uid, bundleName);
}
bool BundleMgrClient::GetBundleInfo(const std::string &bundleName, const BundleFlag flag, BundleInfo &bundleInfo)
bool BundleMgrClient::GetBundleInfo(const std::string &bundleName, const BundleFlag flag, BundleInfo &bundleInfo,
int32_t userId)
{
return impl_->GetBundleInfo(bundleName, flag, bundleInfo);
return impl_->GetBundleInfo(bundleName, flag, bundleInfo, userId);
}
bool BundleMgrClient::GetHapModuleInfo(const std::string &bundleName, const std::string &hapName,

5
interfaces/innerkits/appexecfwk_core/src/bundlemgr/bundle_mgr_client_impl.cpp
View File

@ -54,7 +54,8 @@ bool BundleMgrClientImpl::GetBundleNameForUid(const int uid, std::string &bundle
return bundleMgr_->GetBundleNameForUid(uid, bundleName);
}
bool BundleMgrClientImpl::GetBundleInfo(const std::string &bundleName, const BundleFlag flag, BundleInfo &bundleInfo)
bool BundleMgrClientImpl::GetBundleInfo(const std::string &bundleName, const BundleFlag flag, BundleInfo &bundleInfo,
int32_t userId)
{
APP_LOGI("enter");
@ -64,7 +65,7 @@ bool BundleMgrClientImpl::GetBundleInfo(const std::string &bundleName, const Bun
return false;
}
return bundleMgr_->GetBundleInfo(bundleName, flag, bundleInfo);
return bundleMgr_->GetBundleInfo(bundleName, flag, bundleInfo, userId);
}
bool BundleMgrClientImpl::GetHapModuleInfo(const std::string &bundleName, const std::string &hapName,

10
services/bundlemgr/src/bundle_data_mgr.cpp
View File

@ -2616,7 +2616,7 @@ bool BundleDataMgr::QueryExtensionAbilityInfos(const Want &want, int32_t flags,
bool ret = ImplicitQueryExtensionInfos(want, flags, requestUserId, extensionInfos);
if (ret == false) {
APP_LOGE("implicit queryAbilityInfos error");
APP_LOGE("implicit queryExtensionAbilityInfos error");
return false;
}
if (extensionInfos.size() == 0) {
@ -2640,7 +2640,7 @@ bool BundleDataMgr::ExplicitQueryExtensionInfo(const std::string &bundleName, co
InnerBundleInfo innerBundleInfo;
if (!GetInnerBundleInfoWithFlags(
bundleName, flags, Constants::CURRENT_DEVICE_ID, innerBundleInfo, requestUserId)) {
APP_LOGE("ExplicitQueryAbilityInfo failed");
APP_LOGE("ExplicitQueryExtensionInfo failed");
return false;
}
auto extension = innerBundleInfo.FindExtensionInfo(bundleName, extensionName);
@ -2686,7 +2686,7 @@ bool BundleDataMgr::ImplicitQueryExtensionInfos(
InnerBundleInfo innerBundleInfo;
if (!GetInnerBundleInfoWithFlags(
bundleName, flags, Constants::CURRENT_DEVICE_ID, innerBundleInfo, requestUserId)) {
APP_LOGE("ExplicitQueryAbilityInfo failed");
APP_LOGE("ExplicitQueryExtensionAbilityInfo failed");
return false;
}
int32_t responseUserId = innerBundleInfo.GetResponseUserId(requestUserId);
@ -2700,7 +2700,7 @@ bool BundleDataMgr::ImplicitQueryExtensionInfos(
InnerBundleInfo innerBundleInfo;
if (!GetInnerBundleInfoWithFlags(
item.first, flags, Constants::CURRENT_DEVICE_ID, innerBundleInfo, requestUserId)) {
APP_LOGE("ImplicitQueryAbilityInfos failed");
APP_LOGE("ImplicitQueryExtensionAbilityInfos failed");
continue;
}
int32_t responseUserId = innerBundleInfo.GetResponseUserId(requestUserId);
@ -2754,7 +2754,7 @@ bool BundleDataMgr::QueryExtensionAbilityInfos(const ExtensionAbilityType &exten
InnerBundleInfo innerBundleInfo;
if (!GetInnerBundleInfoWithFlags(
item.first, 0, Constants::CURRENT_DEVICE_ID, innerBundleInfo, requestUserId)) {
APP_LOGE("ImplicitQueryAbilityInfos failed");
APP_LOGE("QueryExtensionAbilityInfos failed");
continue;
}
auto innerExtensionInfos = innerBundleInfo.GetInnerExtensionInfos();

58
test/systemtest/common/bms/bms_client_system_test/bundle_mgr_client_system_test.cpp
View File

@ -20,6 +20,7 @@
#include "ability_info.h"
#include "app_log_wrapper.h"
#include "bundle_constants.h"
#include "bundle_installer_interface.h"
#include "bundle_mgr_client.h"
#include "bundle_mgr_interface.h"
@ -162,7 +163,8 @@ sptr<IBundleInstaller> BundleMgrClientSystemTest::GetInstallerProxy()
}
void BundleMgrClientSystemTest::InstallBundle(
const std::string &bundleFilePath, const InstallFlag installFlag, std::string &installMsg, const int userId = 0)
const std::string &bundleFilePath, const InstallFlag installFlag, std::string &installMsg,
const int userId = Constants::ALL_USERID)
{
sptr<IBundleInstaller> installerProxy = GetInstallerProxy();
if (!installerProxy) {
@ -184,7 +186,7 @@ void BundleMgrClientSystemTest::InstallBundle(
}
void BundleMgrClientSystemTest::UninstallBundle(
const std::string &bundleName, std::string &uninstallMsg, const int userId = 0)
const std::string &bundleName, std::string &uninstallMsg, const int userId = Constants::ALL_USERID)
{
sptr<IBundleInstaller> installerProxy = GetInstallerProxy();
if (!installerProxy) {
@ -406,7 +408,7 @@ HWTEST_F(BundleMgrClientSystemTest, GetResourceConfigFile_007, TestSize.Level1)
std::string uninstallMsg;
UninstallBundle(BUNDLE_NAME, uninstallMsg);
EXPECT_EQ(uninstallMsg, "Success") << "uninstall fail!" << bundleFilePath;
std::cout << "END GetResourceConfigFile_006" << std::endl;
std::cout << "END GetResourceConfigFile_007" << std::endl;
GTEST_LOG_(INFO) << name << " end";
}
@ -452,7 +454,7 @@ HWTEST_F(BundleMgrClientSystemTest, GetResourceConfigFile_008, TestSize.Level1)
std::string uninstallMsg;
UninstallBundle(BUNDLE_NAME, uninstallMsg);
EXPECT_EQ(uninstallMsg, "Success") << "uninstall fail!" << bundleFilePath;
std::cout << "END GetResourceConfigFile_006" << std::endl;
std::cout << "END GetResourceConfigFile_008" << std::endl;
GTEST_LOG_(INFO) << name << " end";
}
@ -489,7 +491,7 @@ HWTEST_F(BundleMgrClientSystemTest, GetResourceConfigFile_009, TestSize.Level1)
std::string uninstallMsg;
UninstallBundle(BUNDLE_NAME, uninstallMsg);
EXPECT_EQ(uninstallMsg, "Success") << "uninstall fail!" << bundleFilePath;
std::cout << "END GetResourceConfigFile_006" << std::endl;
std::cout << "END GetResourceConfigFile_009" << std::endl;
GTEST_LOG_(INFO) << name << " end";
}
@ -533,7 +535,7 @@ HWTEST_F(BundleMgrClientSystemTest, GetResourceConfigFile_010, TestSize.Level1)
std::string uninstallMsg;
UninstallBundle(BUNDLE_NAME, uninstallMsg);
EXPECT_EQ(uninstallMsg, "Success") << "uninstall fail!" << bundleFilePath;
std::cout << "END GetResourceConfigFile_006" << std::endl;
std::cout << "END GetResourceConfigFile_010" << std::endl;
GTEST_LOG_(INFO) << name << " end";
}
@ -568,7 +570,7 @@ HWTEST_F(BundleMgrClientSystemTest, GetResourceConfigFile_011, TestSize.Level1)
std::string uninstallMsg;
UninstallBundle(BUNDLE_NAME, uninstallMsg);
EXPECT_EQ(uninstallMsg, "Success") << "uninstall fail!" << bundleFilePath;
std::cout << "END GetResourceConfigFile_006" << std::endl;
std::cout << "END GetResourceConfigFile_011" << std::endl;
GTEST_LOG_(INFO) << name << " end";
}
@ -603,7 +605,7 @@ HWTEST_F(BundleMgrClientSystemTest, GetResourceConfigFile_012, TestSize.Level1)
std::string uninstallMsg;
UninstallBundle(BUNDLE_NAME, uninstallMsg);
EXPECT_EQ(uninstallMsg, "Success") << "uninstall fail!" << bundleFilePath;
std::cout << "END GetResourceConfigFile_006" << std::endl;
std::cout << "END GetResourceConfigFile_012" << std::endl;
GTEST_LOG_(INFO) << name << " end";
}
@ -638,7 +640,7 @@ HWTEST_F(BundleMgrClientSystemTest, GetResourceConfigFile_013, TestSize.Level1)
std::string uninstallMsg;
UninstallBundle(BUNDLE_NAME, uninstallMsg);
EXPECT_EQ(uninstallMsg, "Success") << "uninstall fail!" << bundleFilePath;
std::cout << "END GetResourceConfigFile_006" << std::endl;
std::cout << "END GetResourceConfigFile_013" << std::endl;
GTEST_LOG_(INFO) << name << " end";
}
@ -677,7 +679,7 @@ HWTEST_F(BundleMgrClientSystemTest, GetResourceConfigFile_014, TestSize.Level1)
std::string uninstallMsg;
UninstallBundle(BUNDLE_NAME, uninstallMsg);
EXPECT_EQ(uninstallMsg, "Success") << "uninstall fail!" << bundleFilePath;
std::cout << "END GetResourceConfigFile_006" << std::endl;
std::cout << "END GetResourceConfigFile_014" << std::endl;
GTEST_LOG_(INFO) << name << " end";
}
@ -839,7 +841,7 @@ HWTEST_F(BundleMgrClientSystemTest, GetResourceConfigFile_020, TestSize.Level1)
std::string uninstallMsg;
UninstallBundle(BUNDLE_NAME, uninstallMsg);
EXPECT_EQ(uninstallMsg, "Success") << "uninstall fail!" << bundleFilePath;
std::cout << "END GetResourceConfigFile_006" << std::endl;
std::cout << "END GetResourceConfigFile_020" << std::endl;
GTEST_LOG_(INFO) << name << " end";
}
@ -883,7 +885,7 @@ HWTEST_F(BundleMgrClientSystemTest, GetResourceConfigFile_021, TestSize.Level1)
std::string uninstallMsg;
UninstallBundle(BUNDLE_NAME, uninstallMsg);
EXPECT_EQ(uninstallMsg, "Success") << "uninstall fail!" << bundleFilePath;
std::cout << "END GetResourceConfigFile_006" << std::endl;
std::cout << "END GetResourceConfigFile_021" << std::endl;
GTEST_LOG_(INFO) << name << " end";
}
@ -929,7 +931,7 @@ HWTEST_F(BundleMgrClientSystemTest, GetResourceConfigFile_022, TestSize.Level1)
std::string uninstallMsg;
UninstallBundle(BUNDLE_NAME, uninstallMsg);
EXPECT_EQ(uninstallMsg, "Success") << "uninstall fail!" << bundleFilePath;
std::cout << "END GetResourceConfigFile_006" << std::endl;
std::cout << "END GetResourceConfigFile_022" << std::endl;
GTEST_LOG_(INFO) << name << " end";
}
@ -966,7 +968,7 @@ HWTEST_F(BundleMgrClientSystemTest, GetResourceConfigFile_023, TestSize.Level1)
std::string uninstallMsg;
UninstallBundle(BUNDLE_NAME, uninstallMsg);
EXPECT_EQ(uninstallMsg, "Success") << "uninstall fail!" << bundleFilePath;
std::cout << "END GetResourceConfigFile_006" << std::endl;
std::cout << "END GetResourceConfigFile_023" << std::endl;
GTEST_LOG_(INFO) << name << " end";
}
@ -1010,7 +1012,7 @@ HWTEST_F(BundleMgrClientSystemTest, GetResourceConfigFile_024, TestSize.Level1)
std::string uninstallMsg;
UninstallBundle(BUNDLE_NAME, uninstallMsg);
EXPECT_EQ(uninstallMsg, "Success") << "uninstall fail!" << bundleFilePath;
std::cout << "END GetResourceConfigFile_006" << std::endl;
std::cout << "END GetResourceConfigFile_024" << std::endl;
GTEST_LOG_(INFO) << name << " end";
}
@ -1045,7 +1047,7 @@ HWTEST_F(BundleMgrClientSystemTest, GetResourceConfigFile_025, TestSize.Level1)
std::string uninstallMsg;
UninstallBundle(BUNDLE_NAME, uninstallMsg);
EXPECT_EQ(uninstallMsg, "Success") << "uninstall fail!" << bundleFilePath;
std::cout << "END GetResourceConfigFile_006" << std::endl;
std::cout << "END GetResourceConfigFile_025" << std::endl;
GTEST_LOG_(INFO) << name << " end";
}
@ -1080,7 +1082,7 @@ HWTEST_F(BundleMgrClientSystemTest, GetResourceConfigFile_026, TestSize.Level1)
std::string uninstallMsg;
UninstallBundle(BUNDLE_NAME, uninstallMsg);
EXPECT_EQ(uninstallMsg, "Success") << "uninstall fail!" << bundleFilePath;
std::cout << "END GetResourceConfigFile_006" << std::endl;
std::cout << "END GetResourceConfigFile_026" << std::endl;
GTEST_LOG_(INFO) << name << " end";
}
@ -1115,7 +1117,7 @@ HWTEST_F(BundleMgrClientSystemTest, GetResourceConfigFile_027, TestSize.Level1)
std::string uninstallMsg;
UninstallBundle(BUNDLE_NAME, uninstallMsg);
EXPECT_EQ(uninstallMsg, "Success") << "uninstall fail!" << bundleFilePath;
std::cout << "END GetResourceConfigFile_006" << std::endl;
std::cout << "END GetResourceConfigFile_027" << std::endl;
GTEST_LOG_(INFO) << name << " end";
}
@ -1154,7 +1156,7 @@ HWTEST_F(BundleMgrClientSystemTest, GetResourceConfigFile_028, TestSize.Level1)
std::string uninstallMsg;
UninstallBundle(BUNDLE_NAME, uninstallMsg);
EXPECT_EQ(uninstallMsg, "Success") << "uninstall fail!" << bundleFilePath;
std::cout << "END GetResourceConfigFile_006" << std::endl;
std::cout << "END GetResourceConfigFile_028" << std::endl;
GTEST_LOG_(INFO) << name << " end";
}
@ -1316,7 +1318,7 @@ HWTEST_F(BundleMgrClientSystemTest, GetResourceConfigFile_034, TestSize.Level1)
std::string uninstallMsg;
UninstallBundle(BUNDLE_NAME, uninstallMsg);
EXPECT_EQ(uninstallMsg, "Success") << "uninstall fail!" << bundleFilePath;
std::cout << "END GetResourceConfigFile_006" << std::endl;
std::cout << "END GetResourceConfigFile_034" << std::endl;
GTEST_LOG_(INFO) << name << " end";
}
@ -1360,7 +1362,7 @@ HWTEST_F(BundleMgrClientSystemTest, GetResourceConfigFile_035, TestSize.Level1)
std::string uninstallMsg;
UninstallBundle(BUNDLE_NAME, uninstallMsg);
EXPECT_EQ(uninstallMsg, "Success") << "uninstall fail!" << bundleFilePath;
std::cout << "END GetResourceConfigFile_006" << std::endl;
std::cout << "END GetResourceConfigFile_035" << std::endl;
GTEST_LOG_(INFO) << name << " end";
}
@ -1406,7 +1408,7 @@ HWTEST_F(BundleMgrClientSystemTest, GetResourceConfigFile_036, TestSize.Level1)
std::string uninstallMsg;
UninstallBundle(BUNDLE_NAME, uninstallMsg);
EXPECT_EQ(uninstallMsg, "Success") << "uninstall fail!" << bundleFilePath;
std::cout << "END GetResourceConfigFile_006" << std::endl;
std::cout << "END GetResourceConfigFile_036" << std::endl;
GTEST_LOG_(INFO) << name << " end";
}
@ -1443,7 +1445,7 @@ HWTEST_F(BundleMgrClientSystemTest, GetResourceConfigFile_037, TestSize.Level1)
std::string uninstallMsg;
UninstallBundle(BUNDLE_NAME, uninstallMsg);
EXPECT_EQ(uninstallMsg, "Success") << "uninstall fail!" << bundleFilePath;
std::cout << "END GetResourceConfigFile_006" << std::endl;
std::cout << "END GetResourceConfigFile_037" << std::endl;
GTEST_LOG_(INFO) << name << " end";
}
@ -1487,7 +1489,7 @@ HWTEST_F(BundleMgrClientSystemTest, GetResourceConfigFile_038, TestSize.Level1)
std::string uninstallMsg;
UninstallBundle(BUNDLE_NAME, uninstallMsg);
EXPECT_EQ(uninstallMsg, "Success") << "uninstall fail!" << bundleFilePath;
std::cout << "END GetResourceConfigFile_006" << std::endl;
std::cout << "END GetResourceConfigFile_038" << std::endl;
GTEST_LOG_(INFO) << name << " end";
}
@ -1522,7 +1524,7 @@ HWTEST_F(BundleMgrClientSystemTest, GetResourceConfigFile_039, TestSize.Level1)
std::string uninstallMsg;
UninstallBundle(BUNDLE_NAME, uninstallMsg);
EXPECT_EQ(uninstallMsg, "Success") << "uninstall fail!" << bundleFilePath;
std::cout << "END GetResourceConfigFile_006" << std::endl;
std::cout << "END GetResourceConfigFile_039" << std::endl;
GTEST_LOG_(INFO) << name << " end";
}
@ -1557,7 +1559,7 @@ HWTEST_F(BundleMgrClientSystemTest, GetResourceConfigFile_040, TestSize.Level1)
std::string uninstallMsg;
UninstallBundle(BUNDLE_NAME, uninstallMsg);
EXPECT_EQ(uninstallMsg, "Success") << "uninstall fail!" << bundleFilePath;
std::cout << "END GetResourceConfigFile_006" << std::endl;
std::cout << "END GetResourceConfigFile_040" << std::endl;
GTEST_LOG_(INFO) << name << " end";
}
@ -1592,7 +1594,7 @@ HWTEST_F(BundleMgrClientSystemTest, GetResourceConfigFile_041, TestSize.Level1)
std::string uninstallMsg;
UninstallBundle(BUNDLE_NAME, uninstallMsg);
EXPECT_EQ(uninstallMsg, "Success") << "uninstall fail!" << bundleFilePath;
std::cout << "END GetResourceConfigFile_006" << std::endl;
std::cout << "END GetResourceConfigFile_041" << std::endl;
GTEST_LOG_(INFO) << name << " end";
}
@ -1631,7 +1633,7 @@ HWTEST_F(BundleMgrClientSystemTest, GetResourceConfigFile_042, TestSize.Level1)
std::string uninstallMsg;
UninstallBundle(BUNDLE_NAME, uninstallMsg);
EXPECT_EQ(uninstallMsg, "Success") << "uninstall fail!" << bundleFilePath;
std::cout << "END GetResourceConfigFile_006" << std::endl;
std::cout << "END GetResourceConfigFile_042" << std::endl;
GTEST_LOG_(INFO) << name << " end";
}
} // namespace AppExecFwk