From 99fc9ac600d00e946c66f256e69c64635b0b90dd Mon Sep 17 00:00:00 2001 From: zhaoyuan Date: Sat, 18 Sep 2021 20:29:10 +0800 Subject: [PATCH 1/2] fixed 93211db from https://gitee.com/skyblackleon/appexecfwk_standard/pulls/48 fixed 6577ea3 from https://gitee.com/skyblackleon/appexecfwk_standard/pulls/47 add form type Signed-off-by: zhaoyuan --- interfaces/innerkits/appexecfwk_base/include/ability_info.h | 1 + services/bundlemgr/src/bundle_profile.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/interfaces/innerkits/appexecfwk_base/include/ability_info.h b/interfaces/innerkits/appexecfwk_base/include/ability_info.h index 781e7c2909..9b0c228a87 100644 --- a/interfaces/innerkits/appexecfwk_base/include/ability_info.h +++ b/interfaces/innerkits/appexecfwk_base/include/ability_info.h @@ -29,6 +29,7 @@ enum class AbilityType { PAGE, SERVICE, DATA, + FORM, }; enum class AbilitySubType { diff --git a/services/bundlemgr/src/bundle_profile.cpp b/services/bundlemgr/src/bundle_profile.cpp index 1f53df16c4..cf89e54805 100644 --- a/services/bundlemgr/src/bundle_profile.cpp +++ b/services/bundlemgr/src/bundle_profile.cpp @@ -29,7 +29,7 @@ namespace ProfileReader { thread_local int32_t parseResult; const std::map ABILITY_TYPE_MAP = { - {"page", AbilityType::PAGE}, {"service", AbilityType::SERVICE}, {"data", AbilityType::DATA}}; + {"page", AbilityType::PAGE}, {"service", AbilityType::SERVICE}, {"data", AbilityType::DATA}}, {"form", AbilityType::FORM}; const std::map DISPLAY_ORIENTATION_MAP = { {"unspecified", DisplayOrientation::UNSPECIFIED}, {"landscape", DisplayOrientation::LANDSCAPE}, -- Gitee From 9bc9b42bfbb37b51bd00e4227929aaa0b2abc26f Mon Sep 17 00:00:00 2001 From: blackleon Date: Sun, 19 Sep 2021 06:06:50 +0000 Subject: [PATCH 2/2] update services/bundlemgr/src/bundle_profile.cpp. Signed-off-by: zhaoyuan --- services/bundlemgr/src/bundle_profile.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/bundlemgr/src/bundle_profile.cpp b/services/bundlemgr/src/bundle_profile.cpp index cf89e54805..a5069a1594 100644 --- a/services/bundlemgr/src/bundle_profile.cpp +++ b/services/bundlemgr/src/bundle_profile.cpp @@ -29,7 +29,7 @@ namespace ProfileReader { thread_local int32_t parseResult; const std::map ABILITY_TYPE_MAP = { - {"page", AbilityType::PAGE}, {"service", AbilityType::SERVICE}, {"data", AbilityType::DATA}}, {"form", AbilityType::FORM}; + {"page", AbilityType::PAGE}, {"service", AbilityType::SERVICE}, {"data", AbilityType::DATA}, {"form", AbilityType::FORM}}; const std::map DISPLAY_ORIENTATION_MAP = { {"unspecified", DisplayOrientation::UNSPECIFIED}, {"landscape", DisplayOrientation::LANDSCAPE}, -- Gitee