openharmony/bundlemanager_bundle_framework_lite
1
0
Fork 0
mirror of https://github.com/openharmony/bundlemanager_bundle_framework_lite.git synced 2026-07-19 12:13:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

!271 告警处理

Browse Source 
Merge pull request !271 from junyi233/myfeature
This commit is contained in:
openharmony_ci
2023-08-24 06:50:56 +00:00
committed by Gitee
parent 2b0a5f3021 a0c7f14805
commit fde56f3cf9
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frameworks/bundle_lite/src/ability_info_utils.cpp
+1 -1
View File
@@ -207,7 +207,7 @@ bool AbilityInfoUtils::SetAbilityInfoSkill(AbilityInfo *abilityInfo, Skill * con
if (skills[i] == nullptr) {
return false;
}
abilityInfo->skills[i] = (Skill *)AdapterMalloc(sizeof(Skill));
abilityInfo->skills[i] = static_cast<Skill *>(AdapterMalloc(sizeof(Skill)));
CopyStringArray(abilityInfo->skills[i]->entities, skills[i]->entities, MAX_SKILL_ITEM);
CopyStringArray(abilityInfo->skills[i]->actions, skills[i]->actions, MAX_SKILL_ITEM);
}
services/bundlemgr_lite/src/gt_bundle_manager_service.cpp
+5 -2
View File
@@ -350,8 +350,8 @@ bool GtManagerService::MatchSkills(const Want *want, Skill *const skills[])
}
bool GtManagerService::isMatchActions(const char *actions, char *const skillActions[])
{
if (actions == nullptr && skillActions == nullptr) {
return true;
if (actions == nullptr || skillActions == nullptr) {
return false;
}
for (int32_t i = 0; i < MAX_SKILL_ITEM; i++) {
if (skillActions[i] == nullptr) {
@@ -953,6 +953,9 @@ void GtManagerService::TransformJsToBcWhenRestart(const char *codePath, const ch
}
cJSON *oldJsEngineVerObj = cJSON_GetObjectItem(installRecordJson, JSON_SUB_KEY_JSENGINE_VERSION);
if (oldJsEngineVerObj == nullptr) {
return;
}
if (cJSON_IsString(oldJsEngineVerObj) && strcmp(oldJsEngineVerObj->valuestring, jsEngineVer_) == 0) {
cJSON_Delete(jsEngineVerObj);
cJSON *transformResultObj = cJSON_GetObjectItem(installRecordJson, JSON_SUB_KEY_TRANSFORM_RESULT);