openharmony/distributedschedule_samgr
1
0
Fork 0
mirror of https://github.com/openharmony/distributedschedule_samgr.git synced 2026-07-20 22:47:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

修改 Review 发现的问题

Browse Source 
Signed-off-by: wangyang2022 <wangyang412@huawei.com>
Change-Id: I57158e1962c67cb9b593d0ba282a2aba58fba25f
This commit is contained in:
wangyang2022
2022-05-05 11:07:09 +08:00
parent a6c06bbe75
commit 168d3cf8bc
4 changed files with 10 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/dtbschedmgr/include/distributed_sched_permission.h
+3 -3
View File
@@ -43,8 +43,8 @@ public:
using AccountInfo = IDistributedSched::AccountInfo;
int32_t CheckDPermission(const AAFwk::Want& want, const CallerInfo& callerInfo,
const AccountInfo& accountInfo, bool needQueryExtension,
const std::string& localDeviceId);
const AccountInfo& accountInfo, const std::string& localDeviceId,
bool needQueryExtension = false);
int32_t CheckGetCallerPermission(const AAFwk::Want& want, const CallerInfo& callerInfo,
const AccountInfo& accountInfo, const std::string& localDeviceId);
int32_t CheckPermission(uint32_t accessToken, const std::string& permissionName) const;
@@ -64,7 +64,7 @@ private:
const CallerInfo& callerInfo, const AccountInfo& accountInfo, const AAFwk::Want& want) const;
bool CheckCustomPermission(const AppExecFwk::AbilityInfo& targetAbility,
const CallerInfo& callerInfo) const;
bool getTargetAbility(const AAFwk::Want& want, bool needQueryExtension, const std::string& localDeviceId,
bool GetTargetAbility(const AAFwk::Want& want, bool needQueryExtension, const std::string& localDeviceId,
AppExecFwk::AbilityInfo& targetAbility, const CallerInfo& callerInfo) const;
};
} // namespace DistributedSchedule
services/dtbschedmgr/src/bundle/bundle_manager_internal.cpp
-22
View File
@@ -143,32 +143,10 @@ bool BundleManagerInternal::QueryExtensionAbilityInfo(const AAFwk::Want& want,
int32_t BundleManagerInternal::InitAbilityInfoFromExtension(AppExecFwk::ExtensionAbilityInfo &extensionAbilityInfo,
AppExecFwk::AbilityInfo &abilityInfo)
{
abilityInfo.applicationName = extensionAbilityInfo.applicationInfo.name;
abilityInfo.applicationInfo = extensionAbilityInfo.applicationInfo;
abilityInfo.bundleName = extensionAbilityInfo.bundleName;
abilityInfo.package = extensionAbilityInfo.moduleName;
abilityInfo.moduleName = extensionAbilityInfo.moduleName;
abilityInfo.name = extensionAbilityInfo.name;
abilityInfo.srcEntrance = extensionAbilityInfo.srcEntrance;
abilityInfo.srcPath = extensionAbilityInfo.srcEntrance;
abilityInfo.iconPath = extensionAbilityInfo.icon;
abilityInfo.iconId = extensionAbilityInfo.iconId;
abilityInfo.label = extensionAbilityInfo.label;
abilityInfo.labelId = extensionAbilityInfo.labelId;
abilityInfo.description = extensionAbilityInfo.description;
abilityInfo.descriptionId = extensionAbilityInfo.descriptionId;
abilityInfo.permissions = extensionAbilityInfo.permissions;
abilityInfo.readPermission = extensionAbilityInfo.readPermission;
abilityInfo.writePermission = extensionAbilityInfo.writePermission;
abilityInfo.extensionAbilityType = extensionAbilityInfo.type;
abilityInfo.visible = extensionAbilityInfo.visible;
abilityInfo.resourcePath = extensionAbilityInfo.resourcePath;
abilityInfo.enabled = extensionAbilityInfo.enabled;
abilityInfo.isModuleJson = true;
abilityInfo.isStageBasedModel = true;
abilityInfo.process = extensionAbilityInfo.process;
abilityInfo.metadata = extensionAbilityInfo.metadata;
abilityInfo.type = AppExecFwk::AbilityType::EXTENSION;
return 0;
}
services/dtbschedmgr/src/distributed_sched_permission.cpp
+5 -6
View File
@@ -53,13 +53,13 @@ void from_json(const nlohmann::json& jsonObject, GroupInfo& groupInfo)
}
int32_t DistributedSchedPermission::CheckDPermission(const AAFwk::Want& want, const CallerInfo& callerInfo,
const AccountInfo& accountInfo, bool needQueryExtension, const std::string& localDeviceId)
const AccountInfo& accountInfo, const std::string& localDeviceId, bool needQueryExtension)
{
if (localDeviceId.empty()) {
return INVALID_PARAMETERS_ERR;
}
AppExecFwk::AbilityInfo targetAbility;
bool result = getTargetAbility(want, needQueryExtension, localDeviceId, targetAbility, callerInfo);
bool result = GetTargetAbility(want, needQueryExtension, localDeviceId, targetAbility, callerInfo);
if (!result) {
HILOGE("CheckDPermission can not find the target ability");
return INVALID_PARAMETERS_ERR;
@@ -155,7 +155,7 @@ bool DistributedSchedPermission::ParseGroupInfos(const std::string& returnGroupS
return true;
}
bool DistributedSchedPermission::getTargetAbility(const AAFwk::Want& want,
bool DistributedSchedPermission::GetTargetAbility(const AAFwk::Want& want,
bool needQueryExtension, const std::string& localDeviceId,
AppExecFwk::AbilityInfo& targetAbility, const CallerInfo& callerInfo) const
{
@@ -172,15 +172,14 @@ bool DistributedSchedPermission::getTargetAbility(const AAFwk::Want& want,
return true;
}
}
HILOGE("QueryAbilityInfo failed");
HILOGE("QueryAbilityInfo failed, want bundle name=%{public}s.", want.GetBundle());
return false;
}
int32_t DistributedSchedPermission::CheckGetCallerPermission(const AAFwk::Want& want, const CallerInfo& callerInfo,
const AccountInfo& accountInfo, const std::string& localDeviceId)
{
bool needQueryExtension = false;
int32_t result = CheckDPermission(want, callerInfo, accountInfo, needQueryExtension, localDeviceId);
int32_t result = CheckDPermission(want, callerInfo, accountInfo, localDeviceId);
if (result != ERR_OK) {
HILOGE("CheckGetCallerPermission fail, error:%{public}d", result);
return result;
services/dtbschedmgr/src/distributed_sched_service.cpp
+2 -4
View File
@@ -168,8 +168,7 @@ int32_t DistributedSchedService::StartAbilityFromRemote(const OHOS::AAFwk::Want&
return INVALID_REMOTE_PARAMETERS_ERR;
}
DistributedSchedPermission& permissionInstance = DistributedSchedPermission::GetInstance();
bool needQueryExtension = false;
ErrCode err = permissionInstance.CheckDPermission(want, callerInfo, accountInfo, needQueryExtension, deviceId);
ErrCode err = permissionInstance.CheckDPermission(want, callerInfo, accountInfo, deviceId);
if (err != ERR_OK) {
HILOGE("CheckDPermission denied!!");
return err;
@@ -922,9 +921,8 @@ int32_t DistributedSchedService::ConnectAbilityFromRemote(const OHOS::AAFwk::Wan
}
DistributedSchedPermission& permissionInstance = DistributedSchedPermission::GetInstance();
bool needQueryExtension = true;
int32_t result = permissionInstance.CheckDPermission(want, callerInfo, accountInfo,
needQueryExtension, localDeviceId);
localDeviceId, true);
if (result != ERR_OK) {
HILOGE("ConnectAbilityFromRemote CheckDPermission denied!!");
return result;