diff --git a/bundle.json b/bundle.json index bf13d42bdf1fd3c775e53f10b4767dbb32ba551a..6249d474d67be45ec3aa128332622e59b5faa7a6 100644 --- a/bundle.json +++ b/bundle.json @@ -13,7 +13,13 @@ "name": "ability_lite", "subsystem": "ability", "syscap": [], - "features": [], + "features": [ + "ability_lite_enable_ohos_appexecfwk_feature_ability", + "ability_lite_enable_ohos_aafwk_multi_tasks_feature", + "ability_lite_config_ohos_aafwk_ams_task_size", + "ability_lite_config_ohos_aafwk_aafwk_lite_task_stack_size", + "ability_lite_config_ohos_aafwk_ability_list_capacity" + ], "adapted_system_type": [ "mini", "small" diff --git a/frameworks/ability_lite/BUILD.gn b/frameworks/ability_lite/BUILD.gn index d396ddf7588ffa7eaa38a1b2379558b930986c44..e9a9bdff36d68638db59d543177c329a36fb8334 100644 --- a/frameworks/ability_lite/BUILD.gn +++ b/frameworks/ability_lite/BUILD.gn @@ -77,7 +77,7 @@ lite_library("ability") { "src/ability_thread.cpp", ] - if (enable_ohos_appexecfwk_feature_ability == true) { + if (ability_lite_enable_ohos_appexecfwk_feature_ability == true) { sources += [ "src/ability_slice.cpp", "src/ability_slice_manager.cpp", @@ -131,7 +131,7 @@ lite_library("ability") { } cflags_cc = cflags - if (enable_ohos_appexecfwk_feature_ability == true) { + if (ability_lite_enable_ohos_appexecfwk_feature_ability == true) { public_deps += [ "${graphic_path}/../arkui/ui_lite:ui_lite" ] } @@ -141,13 +141,13 @@ lite_library("ability") { defines += [ "OPENHARMONY_FONT_PATH" ] - if (enable_ohos_appexecfwk_feature_ability == true) { + if (ability_lite_enable_ohos_appexecfwk_feature_ability == true) { defines += [ "ABILITY_WINDOW_SUPPORT" ] } } lite_component("aafwk_abilitykit_lite") { - if (enable_ohos_appexecfwk_feature_ability == true) { + if (ability_lite_enable_ohos_appexecfwk_feature_ability == true) { public_configs = [ ":abilitykit_config" ] } diff --git a/frameworks/ability_lite/example/BUILD.gn b/frameworks/ability_lite/example/BUILD.gn index 0546e47f9725ffd661a3e490f743d06f07566411..a15d5a5e893086aed182364fa6a23d4ae4583487 100644 --- a/frameworks/ability_lite/example/BUILD.gn +++ b/frameworks/ability_lite/example/BUILD.gn @@ -24,7 +24,7 @@ lite_library("hiability") { "${src_path}/service_ability.cpp", ] - if (enable_ohos_appexecfwk_feature_ability == true) { + if (ability_lite_enable_ohos_appexecfwk_feature_ability == true) { sources += [ "${src_path}/main_ability.cpp", "${src_path}/main_ability_slice.cpp", @@ -52,7 +52,7 @@ lite_library("hiability") { defines = [ "OHOS_APPEXECFWK_BMS_BUNDLEMANAGER" ] - if (enable_ohos_appexecfwk_feature_ability == true) { + if (ability_lite_enable_ohos_appexecfwk_feature_ability == true) { deps += [ "${graphic_path}/../arkui/ui_lite:ui_lite" ] defines += [ "ENABLE_WINDOW=1", diff --git a/interfaces/kits/ability_lite/ability.h b/interfaces/kits/ability_lite/ability.h index d87c9baf6c65767d771ea8f2f254c6da0ca0e494..13aaf0424d7815aa7890f132d685e6debc9d4109 100644 --- a/interfaces/kits/ability_lite/ability.h +++ b/interfaces/kits/ability_lite/ability.h @@ -75,7 +75,7 @@ class AbilityWindow; class Ability : public AbilityContext { public: Ability() = default; - virtual ~Ability() = default; +virtual ~Ability() = default; /** * @brief Called when this ability is started. You must override this function if you want to perform some @@ -92,7 +92,7 @@ public: * STATE_INACTIVE is an instantaneous state. The ability in this state may be visible but does not have * focus. You can override this function to implement your own processing logic. */ - virtual void OnInactive(); + virtual void OnInactive(); /** * @brief Called when this ability enters the STATE_ACTIVE state. diff --git a/services/abilitymgr_lite/BUILD.gn b/services/abilitymgr_lite/BUILD.gn index 3e2c0bafd000269a316fef2e96b517fadfb29505..1fed79d161c28f0b39e94050f2c4a43fbcb112e8 100644 --- a/services/abilitymgr_lite/BUILD.gn +++ b/services/abilitymgr_lite/BUILD.gn @@ -34,26 +34,27 @@ lite_library("abilityms") { "src/slite/slite_ability_loader.cpp", ] - if (defined(config_ohos_aafwk_ams_task_size) && - config_ohos_aafwk_ams_task_size > 0) { - defines = [ "AMS_TASK_STACK_SIZE=$config_ohos_aafwk_ams_task_size" ] + if (defined(ability_lite_config_ohos_aafwk_ams_task_size) && + ability_lite_config_ohos_aafwk_ams_task_size > 0) { + defines = [ + "AMS_TASK_STACK_SIZE=$ability_lite_config_ohos_aafwk_ams_task_size", + ] } - if (defined(config_ohos_aafwk_ability_list_capacity) && - config_ohos_aafwk_ability_list_capacity > 0) { - defines += - [ "ABILITY_LIST_CAPACITY=$config_ohos_aafwk_ability_list_capacity" ] + if (defined(ability_lite_config_ohos_aafwk_ability_list_capacity) && + ability_lite_config_ohos_aafwk_ability_list_capacity > 0) { + defines += [ "ABILITY_LIST_CAPACITY=$ability_lite_config_ohos_aafwk_ability_list_capacity" ] } - if (defined(config_ohos_aafwk_aafwk_lite_task_stack_size) && - config_ohos_aafwk_aafwk_lite_task_stack_size > 0) { + if (defined(ability_lite_config_ohos_aafwk_aafwk_lite_task_stack_size) && + ability_lite_config_ohos_aafwk_aafwk_lite_task_stack_size > 0) { defines += [ - "TASK_STACK_SIZE=$config_ohos_aafwk_aafwk_lite_task_stack_size", - "NATIVE_TASK_STACK_SIZE=$config_ohos_aafwk_ams_task_size", + "TASK_STACK_SIZE=$ability_lite_config_ohos_aafwk_aafwk_lite_task_stack_size", + "NATIVE_TASK_STACK_SIZE=$ability_lite_config_ohos_aafwk_ams_task_size", ] } - if (enable_ohos_aafwk_multi_tasks_feature == true) { + if (ability_lite_enable_ohos_aafwk_multi_tasks_feature == true) { defines += [ "_MINI_MULTI_TASKS_" ] } @@ -136,12 +137,14 @@ lite_library("abilityms") { defines = [ "OHOS_APPEXECFWK_BMS_BUNDLEMANAGER" ] - if (defined(config_ohos_aafwk_ams_task_size) && - config_ohos_aafwk_ams_task_size > 0) { - defines += [ "AMS_TASK_STACK_SIZE=$config_ohos_aafwk_ams_task_size" ] + if (defined(ability_lite_config_ohos_aafwk_ams_task_size) && + ability_lite_config_ohos_aafwk_ams_task_size > 0) { + defines += [ + "AMS_TASK_STACK_SIZE=$ability_lite_config_ohos_aafwk_ams_task_size", + ] } - if (enable_ohos_appexecfwk_feature_ability == true) { + if (ability_lite_enable_ohos_appexecfwk_feature_ability == true) { deps += [ "${graphic_path}/surface_lite" ] defines += [ "ABILITY_WINDOW_SUPPORT" ] } diff --git a/services/abilitymgr_lite/src/ability_connect_mission.cpp b/services/abilitymgr_lite/src/ability_connect_mission.cpp index 076a698198d5e8754124749014ff59fb4ace9a79..0e8ba3012c52ca886c35728515b2edffee114d11 100644 --- a/services/abilitymgr_lite/src/ability_connect_mission.cpp +++ b/services/abilitymgr_lite/src/ability_connect_mission.cpp @@ -21,18 +21,18 @@ namespace OHOS { -namespace { - constexpr static uint16_t SERVICE_RECORDS_LIST_CAPACITY = 10240; -} +namespace{ +constexpr static uint16_t SERVICE_RECORDS_LIST_CAPACITY = 10240; + } AbilityConnectMission::~AbilityConnectMission() { - for (auto iterator = serviceRecords_.begin(); iterator != serviceRecords_.end(); ++iterator) { - auto record = *iterator; - delete record; + for (auto iterator = serviceRecords_.begin();iterator != serviceRecords_.end(); ++iterator) { +auto record = *iterator; +delete record; } - serviceRecords_.clear(); - PRINTD("AbilityConnectMission", "Constructor"); +serviceRecords_.clear(); +PRINTD("AbilityConnectMission", "Constructor"); } void AbilityConnectMission::PushServiceRecord(PageAbilityRecord &abilityRecord) @@ -55,6 +55,7 @@ PageAbilityRecord *AbilityConnectMission::FindServiceRecord(uint64_t token) cons PageAbilityRecord *AbilityConnectMission::FindServiceRecord(const char *bundleName, const char *abilityName) const { + int android,b; CHECK_NULLPTR_RETURN_PTR(bundleName, "AbilityConnectMission", "invalid argument"); CHECK_NULLPTR_RETURN_PTR(abilityName, "AbilityConnectMission", "invalid argument"); for (const auto record : serviceRecords_) { diff --git a/services/abilitymgr_lite/tools/BUILD.gn b/services/abilitymgr_lite/tools/BUILD.gn index b229ac0ecde77d430a044b5697f86a439bf1b958..3f1112bf845e05bfdf8a8753b5b801aebecf5abd 100644 --- a/services/abilitymgr_lite/tools/BUILD.gn +++ b/services/abilitymgr_lite/tools/BUILD.gn @@ -51,7 +51,7 @@ executable("aa") { "//build/lite/config/component/cJSON:cjson_shared", ] - if (enable_ohos_appexecfwk_feature_ability == true) { + if (ability_lite_enable_ohos_appexecfwk_feature_ability == true) { deps += [ "${graphic_path}/../arkui/ui_lite:ui_lite", "${graphic_path}/graphic_utils_lite:utils_lite",