From 7d7e1d3949f58ea95982af6b7e43833ab3e7725d Mon Sep 17 00:00:00 2001 From: sin_dzzeng <13277932042@163.com> Date: Sat, 5 Mar 2022 20:12:18 +0800 Subject: [PATCH] =?UTF-8?q?:=E7=94=A8=E6=88=B7=E7=A8=8B=E5=BA=8F=E6=A1=86?= =?UTF-8?q?=E6=9E=B6UI=E8=A7=A3=E8=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: sin_dzzeng <13277932042@163.com> --- bundle.json | 5 +- feature.gni | 17 ++ .../ability_runtime/include/ability_context.h | 4 +- .../include/ability_context_impl.h | 3 + .../src/ability_context_impl.cpp | 2 + .../ability/ability_runtime/test/BUILD.gn | 5 + frameworks/kits/ability/native/BUILD.gn | 88 +++++--- .../kits/ability/native/include/ability.h | 78 ++++++- .../ability/native/include/ability_impl.h | 15 +- .../include/ability_lifecycle_observer.h | 2 + .../ability_lifecycle_observer_interface.h | 2 + .../include/ability_runtime/js_ability.h | 8 +- .../ability/native/include/ability_thread.h | 2 + .../distributed/continuation_manager.h | 4 +- .../native/include/iability_callback.h | 3 +- .../kits/ability/native/src/ability.cpp | 60 ++++- .../kits/ability/native/src/ability_impl.cpp | 31 ++- .../native/src/ability_impl_factory.cpp | 4 + .../ability/native/src/ability_lifecycle.cpp | 4 + .../native/src/ability_lifecycle_observer.cpp | 2 + .../ability/native/src/ability_process.cpp | 14 +- .../native/src/ability_runtime/js_ability.cpp | 11 +- .../ability_runtime/js_ability_context.cpp | 2 + .../ability/native/src/ability_thread.cpp | 21 +- .../distributed/continuation_manager.cpp | 8 +- .../ability/native/src/new_ability_impl.cpp | 12 +- .../native/src/service_ability_impl.cpp | 2 + frameworks/kits/ability/native/test/BUILD.gn | 184 +++++++++++---- .../native/test/mock/include/mock_ability.cpp | 15 +- .../test/mock/include/mock_ability_impl.h | 2 + .../include/mock_ability_manager_client.h | 2 + .../mock_ability_scheduler_for_observer.h | 2 + .../mock/include/mock_lifecycle_observer.h | 2 + .../include/mock_replace_ability_impl.cpp | 4 + frameworks/kits/appkit/BUILD.gn | 42 +++- .../ability_runtime/context/context_impl.cpp | 4 + .../appkit/native/app/src/main_thread.cpp | 9 +- frameworks/kits/appkit/native/test/BUILD.gn | 19 +- frameworks/kits/test/BUILD.gn | 29 ++- .../completed_dispatcher_test/BUILD.gn | 14 +- .../test/unittest/pending_want_test/BUILD.gn | 14 +- .../test/unittest/trigger_Info_test/BUILD.gn | 14 +- .../unittest/want_agent_helper_test/BUILD.gn | 14 +- .../unittest/want_agent_info_test/BUILD.gn | 14 +- .../test/unittest/want_agent_test/BUILD.gn | 14 +- interfaces/innerkits/BUILD.gn | 7 +- interfaces/innerkits/ability_manager/BUILD.gn | 42 ++-- .../include/ability_scheduler_interface.h | 2 + .../include/mission_snapshot.h | 5 +- .../ability_manager/include/snapshot.h | 4 + interfaces/kits/napi/BUILD.gn | 20 +- .../kits/napi/aafwk/abilityManager/BUILD.gn | 12 +- .../abilityManager/napi_ability_manager.cpp | 4 + .../abilityManager/napi_ability_manager.h | 2 + .../kits/napi/aafwk/app/app_manager/BUILD.gn | 12 +- .../inner/napi_common/napi_common_ability.cpp | 4 +- .../kits/napi/aafwk/mission_manager/BUILD.gn | 12 +- .../aafwk/mission_manager/mission_manager.cpp | 4 + services/BUILD.gn | 7 +- services/abilitymgr/BUILD.gn | 39 +++- services/abilitymgr/abilitymgr.gni | 71 +++--- .../include/ability_manager_service.h | 4 + services/abilitymgr/include/ability_record.h | 10 + .../include/ability_scheduler_proxy.h | 4 + .../include/ability_scheduler_stub.h | 2 + .../abilitymgr/src/ability_manager_client.cpp | 25 ++ .../src/ability_manager_service.cpp | 111 ++++++++- services/abilitymgr/src/ability_record.cpp | 20 ++ .../src/ability_scheduler_proxy.cpp | 2 + .../abilitymgr/src/ability_scheduler_stub.cpp | 6 + services/abilitymgr/test/BUILD.gn | 213 +----------------- .../test/mock/appmgr_test_service/BUILD.gn | 9 +- .../libs/aakit/include/ability_scheduler.h | 7 +- .../mock/libs/aakit/src/ability_scheduler.cpp | 3 + .../ability_scheduler_mock.h | 2 + .../ability_schedule_stub_mock.h | 3 + .../ability_stack_manager_test.cpp | 8 + .../mock_ability_scheduler.cpp | 3 + .../screenshot_handler_test.cpp | 4 + services/appmgr/BUILD.gn | 6 +- services/appmgr/src/app_mgr_service_inner.cpp | 5 + services/appmgr/test/BUILD.gn | 6 +- .../mock/include/mock_ability_scheduler.h | 2 + .../include/mock_ability_scheduler_stub.h | 2 + .../ability_mgr_service_test/BUILD.gn | 18 +- .../moduletest/ability_record_test/BUILD.gn | 18 +- .../moduletest/ability_stack_test/BUILD.gn | 22 +- .../ability_stack_module_test.cpp | 14 ++ .../common/ams/app_mgr_service_test/BUILD.gn | 10 +- .../service_app_spawn_client_test/BUILD.gn | 10 +- .../ams/service_event_drive_test/BUILD.gn | 10 +- .../ams/service_start_process_test/BUILD.gn | 10 +- .../test/moduletest/dump_module_test/BUILD.gn | 14 +- .../ipc_ability_connect_test/BUILD.gn | 15 +- .../moduletest/ipc_ability_mgr_test/BUILD.gn | 14 +- .../ipc_ability_scheduler_test/BUILD.gn | 10 +- .../panding_want_manager_test/BUILD.gn | 17 +- .../amssystemtestability/abilitySrc/BUILD.gn | 9 +- test/systemtest/BUILD.gn | 5 +- test/systemtest/common/ams/BUILD.gn | 10 +- tools/BUILD.gn | 6 +- 101 files changed, 1202 insertions(+), 521 deletions(-) create mode 100644 feature.gni mode change 100755 => 100644 frameworks/kits/ability/native/include/ability.h mode change 100755 => 100644 services/abilitymgr/test/mock/libs/aakit/include/ability_scheduler.h mode change 100755 => 100644 services/abilitymgr/test/mock/libs/ability_scheduler_mock/ability_scheduler_mock.h mode change 100755 => 100644 services/abilitymgr/test/unittest/phone/ability_scheduler_stub_test/ability_schedule_stub_mock.h mode change 100755 => 100644 services/test/mock/include/mock_ability_scheduler.h mode change 100755 => 100644 services/test/mock/include/mock_ability_scheduler_stub.h mode change 100755 => 100644 services/test/moduletest/common/ams/app_mgr_service_test/BUILD.gn mode change 100755 => 100644 services/test/moduletest/common/ams/service_app_spawn_client_test/BUILD.gn mode change 100755 => 100644 services/test/moduletest/common/ams/service_event_drive_test/BUILD.gn mode change 100755 => 100644 services/test/moduletest/common/ams/service_start_process_test/BUILD.gn mode change 100755 => 100644 services/test/moduletest/panding_want_manager_test/BUILD.gn mode change 100755 => 100644 test/systemtest/common/ams/BUILD.gn diff --git a/bundle.json b/bundle.json index 62ba325842f..22a8b0e7513 100644 --- a/bundle.json +++ b/bundle.json @@ -13,7 +13,10 @@ "name": "ability_runtime", "subsystem": "aafwk", "syscap": [], - "features": [], + "features": [ + "ability_runtime_graphics", + "ability_runtime_power" + ], "adapted_system_type": [ "standard" ], diff --git a/feature.gni b/feature.gni new file mode 100644 index 00000000000..1c13e4de789 --- /dev/null +++ b/feature.gni @@ -0,0 +1,17 @@ +# Copyright (c) 2022 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +declare_args() { + ability_runtime_graphics = true + ability_runtime_power = true +} diff --git a/frameworks/kits/ability/ability_runtime/include/ability_context.h b/frameworks/kits/ability/ability_runtime/include/ability_context.h index 570dc6319c7..c18295283c9 100644 --- a/frameworks/kits/ability/ability_runtime/include/ability_context.h +++ b/frameworks/kits/ability/ability_runtime/include/ability_context.h @@ -240,9 +240,9 @@ public: virtual void SetConfiguration(const std::shared_ptr &config) = 0; virtual void RegisterAbilityCallback(std::weak_ptr abilityCallback) = 0; - +#ifdef SUPPORT_GRAPHICS virtual int GetCurrentWindowMode() = 0; - +#endif using SelfType = AbilityContext; static const size_t CONTEXT_TYPE_ID; diff --git a/frameworks/kits/ability/ability_runtime/include/ability_context_impl.h b/frameworks/kits/ability/ability_runtime/include/ability_context_impl.h index 206a55fd81a..33a15771627 100644 --- a/frameworks/kits/ability/ability_runtime/include/ability_context_impl.h +++ b/frameworks/kits/ability/ability_runtime/include/ability_context_impl.h @@ -158,10 +158,13 @@ public: */ void RegisterAbilityCallback(std::weak_ptr abilityCallback) override; +#ifdef SUPPORT_GRAPHICS /** * get current window mode */ int GetCurrentWindowMode() override; +#endif + private: sptr token_; std::shared_ptr abilityInfo_ = nullptr; diff --git a/frameworks/kits/ability/ability_runtime/src/ability_context_impl.cpp b/frameworks/kits/ability/ability_runtime/src/ability_context_impl.cpp index 7fe1a471cf0..8344ce31193 100644 --- a/frameworks/kits/ability/ability_runtime/src/ability_context_impl.cpp +++ b/frameworks/kits/ability/ability_runtime/src/ability_context_impl.cpp @@ -377,6 +377,7 @@ void AbilityContextImpl::RegisterAbilityCallback(std::weak_ptrGetCurrentWindowMode(); } +#endif } // namespace AbilityRuntime } // namespace OHOS \ No newline at end of file diff --git a/frameworks/kits/ability/ability_runtime/test/BUILD.gn b/frameworks/kits/ability/ability_runtime/test/BUILD.gn index cbdb9dc5c40..dff9a85e7cf 100644 --- a/frameworks/kits/ability/ability_runtime/test/BUILD.gn +++ b/frameworks/kits/ability/ability_runtime/test/BUILD.gn @@ -13,6 +13,7 @@ import("//build/test.gni") import("//foundation/aafwk/standard/aafwk.gni") +import("//foundation/aafwk/standard/feature.gni") module_output_path = "ability_runtime/ability_call_test" ############################################################################### @@ -67,6 +68,10 @@ ohos_moduletest("ability_caller_fw_module_test") { "native_appdatamgr:native_dataability", "native_appdatamgr:native_rdb", ] + + if (ability_runtime_graphics) { + external_deps += [ "multimodalinput_base:libmmi-client" ] + } } ################################################################################ diff --git a/frameworks/kits/ability/native/BUILD.gn b/frameworks/kits/ability/native/BUILD.gn index f4366b8e9d1..9d2f95296a9 100644 --- a/frameworks/kits/ability/native/BUILD.gn +++ b/frameworks/kits/ability/native/BUILD.gn @@ -12,6 +12,7 @@ # limitations under the License. import("//build/ohos.gni") +import("//foundation/aafwk/standard/feature.gni") SUBSYSTEM_DIR = "//foundation/aafwk/standard/frameworks/kits/ability/native" INNERKITS_PATH = "//foundation/aafwk/standard/interfaces/innerkits" @@ -30,14 +31,12 @@ config("ability_config") { "//foundation/appexecfwk/standard/common/log/include", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core/include/bundlemgr", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include/", - "//foundation/aafwk/standard/interfaces/innerkits/form_manager/include", "//foundation/aafwk/standard/frameworks/kits/appkit/native/ability_runtime/app", "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/include", "//foundation/aafwk/standard/frameworks/kits/fmskit/native/include", "//foundation/aafwk/standard/frameworks/kits/app/native/app/include", "//foundation/aafwk/standard/services/common/include", "//base/global/resmgr_standard/interfaces/innerkits/include", - "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/featureAbility", "//foundation/ace/napi/interfaces/kits", "//third_party/node/src", "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", @@ -62,6 +61,14 @@ config("ability_config") { "APP_LOG_TAG = \"Ability\"", "LOG_DOMAIN = 0xD002200", ] + + if (ability_runtime_graphics) { + include_dirs += [ + "//foundation/aafwk/standard/interfaces/innerkits/form_manager/include", + "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/featureAbility", + ] + defines += [ "SUPPORT_GRAPHICS" ] + } } config("ability_public_config") { @@ -83,13 +90,18 @@ config("ability_public_config") { "//foundation/aafwk/standard/interfaces/innerkits/ability_manager/include/continuation", "//base/global/resmgr_standard/interfaces/innerkits/include", "//foundation/aafwk/standard/frameworks/kits/ability/native/include/continuation/kits", - "//foundation/aafwk/standard/frameworks/kits/fmskit/native/include", - "//foundation/aafwk/standard/interfaces/innerkits/form_manager/include", - "//foundation/windowmanager/interfaces/innerkits/wm", - "//foundation/windowmanager/interfaces/kits/napi/window_runtime/window_stage_napi", "//third_party/jsoncpp/include", "//third_party/json/include", ] + + if (ability_runtime_graphics) { + include_dirs += [ + "//foundation/aafwk/standard/frameworks/kits/fmskit/native/include", + "//foundation/aafwk/standard/interfaces/innerkits/form_manager/include", + "//foundation/windowmanager/interfaces/innerkits/wm", + "//foundation/windowmanager/interfaces/kits/napi/window_runtime/window_stage_napi", + ] + } } ohos_shared_library("static_subscriber_ipc") { @@ -126,7 +138,6 @@ ohos_shared_library("abilitykit_native") { "//foundation/distributeddatamgr/appdatamgr/frameworks/jskitsimpl/napi_dataability/include", "//foundation/distributeddatamgr/appdatamgr/frameworks/jskitsimpl/napi_resultset/include", "//foundation/distributeddatamgr/objectstore/interfaces/innerkits/", - "//base/global/i18n_standard/frameworks/intl/include", ] sources = [ @@ -143,7 +154,6 @@ ohos_shared_library("abilitykit_native") { "${SUBSYSTEM_DIR}/src/ability_post_event_timeout.cpp", "${SUBSYSTEM_DIR}/src/ability_process.cpp", "${SUBSYSTEM_DIR}/src/ability_thread.cpp", - "${SUBSYSTEM_DIR}/src/ability_window.cpp", "${SUBSYSTEM_DIR}/src/data_ability_helper.cpp", "${SUBSYSTEM_DIR}/src/data_ability_impl.cpp", "${SUBSYSTEM_DIR}/src/data_ability_operation.cpp", @@ -159,17 +169,10 @@ ohos_shared_library("abilitykit_native") { "${SUBSYSTEM_DIR}/src/extension.cpp", "${SUBSYSTEM_DIR}/src/extension_impl.cpp", "${SUBSYSTEM_DIR}/src/extension_module_loader.cpp", - "${SUBSYSTEM_DIR}/src/form_extension.cpp", #"${SUBSYSTEM_DIR}/src/dummy_data_ability_predicates.cpp", #"${SUBSYSTEM_DIR}/src/dummy_result_set.cpp", #"${SUBSYSTEM_DIR}/src/dummy_values_bucket.cpp", - "${SUBSYSTEM_DIR}/src/form_js_event_handler.cpp", - "${SUBSYSTEM_DIR}/src/form_provider_client.cpp", - "${SUBSYSTEM_DIR}/src/form_runtime/form_extension_provider_client.cpp", - "${SUBSYSTEM_DIR}/src/form_runtime/js_form_extension.cpp", - "${SUBSYSTEM_DIR}/src/form_runtime/js_form_extension_context.cpp", - "${SUBSYSTEM_DIR}/src/form_runtime/js_form_extension_util.cpp", "${SUBSYSTEM_DIR}/src/js_datashare_ext_ability.cpp", "${SUBSYSTEM_DIR}/src/js_datashare_ext_ability_context.cpp", "${SUBSYSTEM_DIR}/src/js_service_extension.cpp", @@ -178,7 +181,6 @@ ohos_shared_library("abilitykit_native") { "${SUBSYSTEM_DIR}/src/js_static_subscriber_extension_context.cpp", "${SUBSYSTEM_DIR}/src/mission_information.cpp", "${SUBSYSTEM_DIR}/src/new_ability_impl.cpp", - "${SUBSYSTEM_DIR}/src/page_ability_impl.cpp", "${SUBSYSTEM_DIR}/src/service_ability_impl.cpp", "${SUBSYSTEM_DIR}/src/service_extension.cpp", "${SUBSYSTEM_DIR}/src/static_subscriber_extension.cpp", @@ -210,7 +212,6 @@ ohos_shared_library("abilitykit_native") { "//foundation/aafwk/standard/frameworks/kits/appkit/native/ability_runtime/context/context_impl.cpp", "//foundation/aafwk/standard/frameworks/kits/appkit/native/ability_runtime/datashare_ext_ability_context.cpp", "//foundation/aafwk/standard/frameworks/kits/appkit/native/ability_runtime/extension_context.cpp", - "//foundation/aafwk/standard/frameworks/kits/appkit/native/ability_runtime/form_extension_context.cpp", "//foundation/aafwk/standard/frameworks/kits/appkit/native/ability_runtime/service_extension_context.cpp", "//foundation/aafwk/standard/frameworks/kits/appkit/native/ability_runtime/static_subscriber_extension_context.cpp", "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/src/application_context.cpp", @@ -255,9 +256,7 @@ ohos_shared_library("abilitykit_native") { "//foundation/appexecfwk/standard/common:libappexecfwk_common", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", - "//foundation/multimodalinput/input/frameworks/proxy:libmmi-common", "//foundation/resourceschedule/background_task_mgr/interfaces/innerkits:bgtaskmgr_innerkits", - "//third_party/icu/icu4c:shared_icuuc", ] external_deps = [ @@ -272,11 +271,8 @@ ohos_shared_library("abilitykit_native") { "bytrace_standard:bytrace_core", "ces_standard:cesfwk_innerkits", "distributeddataobject:distributeddataobject_impl", - "form_runtime:fmskit_native", - "form_runtime:form_manager", "ipc:ipc_core", "ipc_js:rpc", - "multimodalinput_base:libmmi-client", "native_appdatamgr:native_appdatafwk", "native_appdatamgr:native_dataability", "native_appdatamgr:native_rdb", @@ -284,18 +280,46 @@ ohos_shared_library("abilitykit_native") { ] public_deps = [ - "//base/global/i18n_standard/frameworks/intl:intl_util", "//base/global/resmgr_standard/frameworks/resmgr:global_resmgr", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", "//foundation/ace/napi:ace_napi", "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", - "//foundation/graphic/standard:libwmclient", - "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", - "//foundation/windowmanager/dm:libdm", - "//foundation/windowmanager/interfaces/kits/napi/window_runtime:windowstage_kit", - "//foundation/windowmanager/wm:libwm", ] + if (ability_runtime_graphics) { + include_dirs += [ "//base/global/i18n_standard/frameworks/intl/include" ] + sources += [ + "${SUBSYSTEM_DIR}/src/ability_window.cpp", + "${SUBSYSTEM_DIR}/src/form_extension.cpp", + "${SUBSYSTEM_DIR}/src/form_js_event_handler.cpp", + "${SUBSYSTEM_DIR}/src/form_provider_client.cpp", + "${SUBSYSTEM_DIR}/src/form_runtime/form_extension_provider_client.cpp", + "${SUBSYSTEM_DIR}/src/form_runtime/js_form_extension.cpp", + "${SUBSYSTEM_DIR}/src/form_runtime/js_form_extension_context.cpp", + "${SUBSYSTEM_DIR}/src/form_runtime/js_form_extension_util.cpp", + "${SUBSYSTEM_DIR}/src/page_ability_impl.cpp", + "//foundation/aafwk/standard/frameworks/kits/appkit/native/ability_runtime/form_extension_context.cpp", + ] + deps += [ + "//foundation/multimodalinput/input/frameworks/proxy:libmmi-common", + "//third_party/icu/icu4c:shared_icuuc", + ] + + external_deps += [ + "form_runtime:fmskit_native", + "form_runtime:form_manager", + "multimodalinput_base:libmmi-client", + ] + + public_deps += [ + "//base/global/i18n_standard/frameworks/intl:intl_util", + "//foundation/graphic/standard:libwmclient", + "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", + "//foundation/windowmanager/dm:libdm", + "//foundation/windowmanager/interfaces/kits/napi/window_runtime:windowstage_kit", + "//foundation/windowmanager/wm:libwm", + ] + } subsystem_name = "aafwk" part_name = "ability_runtime" } @@ -328,7 +352,9 @@ ohos_shared_library("service_extension_module") { include_dirs = [ "//foundation/aafwk/standard/frameworks/kits/ability/native/include" ] - sources = [ "//foundation/aafwk/standard/frameworks/kits/ability/native/src/service_extension_module_loader.cpp" ] + sources = [ + "//foundation/aafwk/standard/frameworks/kits/ability/native/src/service_extension_module_loader.cpp", + ] configs = [ ":ability_config" ] public_configs = [ ":ability_public_config" ] @@ -352,7 +378,9 @@ ohos_shared_library("datashare_ext_ability_module") { include_dirs = [ "//foundation/aafwk/standard/frameworks/kits/ability/native/include" ] - sources = [ "//foundation/aafwk/standard/frameworks/kits/ability/native/src/datashare_ext_ability_module_loader.cpp" ] + sources = [ + "//foundation/aafwk/standard/frameworks/kits/ability/native/src/datashare_ext_ability_module_loader.cpp", + ] configs = [ ":ability_config" ] public_configs = [ ":ability_public_config" ] diff --git a/frameworks/kits/ability/native/include/ability.h b/frameworks/kits/ability/native/include/ability.h old mode 100755 new mode 100644 index 6ea00909be1..e03afbb36ee --- a/frameworks/kits/ability/native/include/ability.h +++ b/frameworks/kits/ability/native/include/ability.h @@ -25,15 +25,20 @@ #include "ability_event_interface.h" #include "ability_lifecycle_executor.h" #include "ability_lifecycle_interface.h" +#ifdef SUPPORT_GRAPHICS #include "ability_window.h" +#endif #include "configuration.h" #include "context.h" #include "continuation_handler.h" #include "continuation_state.h" +#ifdef SUPPORT_GRAPHICS #include "display_manager.h" +#endif #include "dummy_ability_package.h" #include "dummy_component_container.h" #include "dummy_notification_request.h" +#ifdef SUPPORT_GRAPHICS #include "form_callback_interface.h" #include "form_constants.h" #include "form_death_callback.h" @@ -41,14 +46,20 @@ #include "form_provider_info.h" #include "foundation/multimodalinput/input/interfaces/native/innerkits/event/include/key_event.h" #include "foundation/multimodalinput/input/interfaces/native/innerkits/event/include/pointer_event.h" +#endif #include "iability_callback.h" +#ifndef SUPPORT_GRAPHICS +#include "inttypes.h" +#endif #include "iremote_object.h" #include "pac_map.h" #include "want.h" #include "want_agent.h" +#ifdef SUPPORT_GRAPHICS #include "window_option.h" #include "window_scene.h" #include "wm_common.h" +#endif #include "../../ability_runtime/include/ability_context.h" using Uri = OHOS::Uri; @@ -62,14 +73,18 @@ class ValuesBucket; namespace AbilityRuntime { class Runtime; } +#ifdef SUPPORT_GRAPHICS class KeyEvent; +#endif namespace AppExecFwk { class DataAbilityResult; class DataAbilityOperation; class AbilityPostEventTimeout; class OHOSApplication; class AbilityHandler; +#ifdef SUPPORT_GRAPHICS class AbilityWindow; +#endif class ILifeCycle; class ContinuationManager; class ContinuationRegisterManager; @@ -77,14 +92,18 @@ class IContinuationRegisterManager; class Ability : public IAbilityEvent, public ILifeCycle, public AbilityContext, +#ifdef SUPPORT_GRAPHICS public FormCallbackInterface, + public OHOS::Rosen::DisplayManager::IDisplayListener, + public OHOS::Rosen::IDisplayMoveListener, +#endif public IAbilityContinuation, public IAbilityCallback, - public std::enable_shared_from_this, - public OHOS::Rosen::DisplayManager::IDisplayListener, - public OHOS::Rosen::IDisplayMoveListener { + public std::enable_shared_from_this { public: +#ifdef SUPPORT_GRAPHICS friend class PageAbilityImpl; +#endif friend class NewAbilityImpl; static Ability* Create(const std::unique_ptr& runtime); @@ -124,6 +143,7 @@ public: */ virtual void AddActionRoute(const std::string &action, const std::string &entry) final; +#ifdef SUPPORT_GRAPHICS /** * @brief Sets the background color of the window in RGB color mode. * @@ -136,6 +156,7 @@ public: * @return Returns the result of SetWindowBackgroundColor */ virtual int SetWindowBackgroundColor(int red, int green, int blue) final; +#endif /** * @brief Destroys this Page or Service ability. @@ -167,6 +188,7 @@ public: */ bool IsUpdatingConfigurations() override; +#ifdef SUPPORT_GRAPHICS /** * @brief Informs the system of the time required for drawing this Page ability. * @@ -188,6 +210,7 @@ public: * @param layoutRes Indicates the layout resource ID, which cannot be a negative number. */ virtual void SetUIContent(int layoutRes) final; +#endif /** * Start other ability for result. @@ -271,6 +294,7 @@ public: */ virtual void OnInactive(); +#ifdef SUPPORT_GRAPHICS /** * @brief Called after instantiating WindowScene. * @@ -348,6 +372,7 @@ public: * @return Returns true if the event is handled; returns false otherwise. */ virtual void OnPointerEvent(std::shared_ptr& pointerEvent); +#endif /** * @brief Called when this Service ability is connected for the first time. @@ -367,6 +392,7 @@ public: */ virtual void OnDisconnect(const Want &want); +#ifdef SUPPORT_GRAPHICS /** * @brief Inflates UI controls by using ComponentContainer. * You can create a ComponentContainer instance that contains multiple components. @@ -429,6 +455,7 @@ public: * @return Returns true if this ability currently has window focus; returns false otherwise. */ bool HasWindowFocus(); +#endif /** * @description: Obtains api version based on ability. @@ -443,6 +470,7 @@ public: */ void SetCompatibleVersion(int compatibleVersion); +#ifdef SUPPORT_GRAPHICS /** * @brief Called when a key is lone pressed. * @@ -453,6 +481,7 @@ public: * is not handled and should be passed to other handlers. */ virtual bool OnKeyPressAndHold(int keyCode, const std::shared_ptr &keyEvent); +#endif /** * @brief Called back after permissions are requested by using @@ -470,12 +499,14 @@ public: virtual void OnRequestPermissionsFromUserResult( int requestCode, const std::vector &permissions, const std::vector &grantResults); +#ifdef SUPPORT_GRAPHICS /** * @brief Called when this ability is about to leave the foreground and enter the background due to a user * operation, for example, when the user touches the Home key. * */ virtual void OnLeaveForeground(); +#endif /** * @brief Obtains the MIME type matching the data specified by the URI of the Data ability. This method should be @@ -666,12 +697,14 @@ public: */ virtual void SetResult(int resultCode, const Want &resultData) final; +#ifdef SUPPORT_GRAPHICS /** * @brief Sets the type of audio whose volume will be adjusted by the volume button. * * @param volumeType Indicates the AudioManager.AudioVolumeType to set. */ virtual void SetVolumeTypeAdjustedByKey(int volumeType); +#endif /** * @brief Called back when Service is started. @@ -868,12 +901,14 @@ public: */ virtual int BatchInsert(const Uri &uri, const std::vector &values); +#ifdef SUPPORT_GRAPHICS /** * @brief Obtains the type of audio whose volume is adjusted by the volume button. * * @return Returns the AudioManager.AudioVolumeType. */ int GetVolumeTypeAdjustedByKey(); +#endif /** * @brief Obtains the lifecycle state of this ability. @@ -972,6 +1007,7 @@ public: */ std::shared_ptr CreatePostEventTimeouter(std::string taskstr); +#ifdef SUPPORT_GRAPHICS /** * Releases an obtained form by its ID. * @@ -1037,6 +1073,7 @@ public: * */ bool DeleteForm(const int64_t formId); +#endif /** * @brief Keep this Service ability in the background and displays a notification bar. @@ -1053,6 +1090,7 @@ public: */ virtual int StopBackgroundRunning() final; +#ifdef SUPPORT_GRAPHICS /** * @brief The form callback. */ @@ -1318,6 +1356,7 @@ public: * @return Returns true if the request is successfully initiated; returns false otherwise. */ bool GetFormsInfoByModule(std::string &bundleName, std::string &moduleName, std::vector &formInfos); +#endif /** * @brief Acquire a bundle manager, if it not existed, @@ -1349,12 +1388,14 @@ public: */ virtual bool OnContinue(WantParams &wantParams); +#ifdef SUPPORT_GRAPHICS /** * @brief Get page ability stack info. * * @return A string represents page ability stack info, empty if failed; */ virtual std::string GetContentInfo(); +#endif /** * @brief Migrates this ability to the given device on the same distributed network. The ability to migrate and its @@ -1432,6 +1473,7 @@ public: */ virtual void OnRemoteTerminated() override; +#ifdef SUPPORT_GRAPHICS /** * @brief Set WindowScene listener * @@ -1439,6 +1481,7 @@ public: * @return None. */ void SetSceneListener(const sptr &listener); +#endif /** * @brief request a remote object of callee from this ability. @@ -1446,18 +1489,22 @@ public: */ virtual sptr CallRequest(); +#ifdef SUPPORT_GRAPHICS /** * @brief Called back at ability context. */ virtual int GetCurrentWindowMode() override; uint32_t sceneFlag_ = 0; +#endif protected: +#ifdef SUPPORT_GRAPHICS /** * @brief Acquire a form provider remote object. * @return Returns form provider remote object. */ sptr GetFormRemoteObject(); +#endif /** * @brief Acquire the launch parameter. @@ -1465,6 +1512,7 @@ protected: */ const AAFwk::LaunchParam& GetLaunchParam() const; +#ifdef SUPPORT_GRAPHICS /** * @brief process when foreground executed. * @@ -1484,6 +1532,7 @@ protected: * @return window option. */ sptr GetWindowOption(const Want &want); +#endif /** * @brief judge where invoke resoreWindowStage in continuation @@ -1506,6 +1555,7 @@ protected: */ void NotityContinuationResult(const Want& want, bool success); +#ifdef SUPPORT_GRAPHICS /** * @brief override Rosen::DisplayManager::IDisplayListener virtual callback function * @@ -1522,14 +1572,15 @@ protected: * @param to the displayId after display move */ void OnDisplayMove(Rosen::DisplayId from, Rosen::DisplayId to) override; - +#endif protected: std::shared_ptr abilityContext_ = nullptr; - std::shared_ptr scene_ = nullptr; std::shared_ptr setting_ = nullptr; - sptr sceneListener_ = nullptr; LaunchParam launchParam_; - +#ifdef SUPPORT_GRAPHICS + std::shared_ptr scene_ = nullptr; + sptr sceneListener_ = nullptr; +#endif private: std::shared_ptr ParsePredictionArgsReference( std::vector> &results, std::shared_ptr &operation, @@ -1573,11 +1624,14 @@ private: std::shared_ptr abilityLifecycleExecutor_ = nullptr; std::shared_ptr application_ = nullptr; std::vector types_; +#ifdef SUPPORT_GRAPHICS std::shared_ptr abilityWindow_ = nullptr; +#endif std::shared_ptr setWant_ = nullptr; sptr reverseContinuationSchedulerReplica_ = nullptr; - +#ifdef SUPPORT_GRAPHICS bool bWindowFocus_ = false; +#endif int compatibleVersion_ = 0; static const std::string SYSTEM_UI; @@ -1593,12 +1647,13 @@ private: // If session id cannot get from want, assign it as default. static const int DEFAULT_DMS_SESSION_ID; - +#ifdef SUPPORT_GRAPHICS std::vector lostedByReconnectTempForms_; std::map> appCallbacks_; +#endif std::map userReqParams_; sptr iBundleMgr_; - +#ifdef SUPPORT_GRAPHICS static const int32_t OHOS_FORM_ACQUIRE_FORM = 0; static const int32_t OHOS_FORM_UPDATE_FORM = 1; @@ -1607,9 +1662,11 @@ private: static const int32_t DISABLE_FORM_UPDATE = 6; static const int32_t RELEASE_FORM = 8; static const int32_t RELEASE_CACHED_FORM = 9; +#endif static const int64_t MIN_NEXT_TIME = 5; private: +#ifdef SUPPORT_GRAPHICS /** * @brief Delete or release form with formId. * @@ -1685,6 +1742,7 @@ private: * @return Returns true if the request is successfully initiated; returns false otherwise. */ bool ReAcquireForm(const int64_t formId, const Want &want); +#endif }; } // namespace AppExecFwk } // namespace OHOS diff --git a/frameworks/kits/ability/native/include/ability_impl.h b/frameworks/kits/ability/native/include/ability_impl.h index 00b69e0cc1f..c994331a2a9 100755 --- a/frameworks/kits/ability/native/include/ability_impl.h +++ b/frameworks/kits/ability/native/include/ability_impl.h @@ -29,7 +29,9 @@ #include "dummy_values_bucket.h" #include "dummy_data_ability_predicates.h" #include "dummy_result_set.h" +#ifdef SUPPORT_GRAPHICS #include "foundation/multimodalinput/input/interfaces/native/innerkits/event/include/i_input_event_consumer.h" +#endif namespace OHOS { namespace AppExecFwk { class Ability; @@ -113,6 +115,7 @@ public: // Page Service Ability has different AbilityTransaction virtual void HandleAbilityTransaction(const Want &want, const AAFwk::LifeCycleStateInfo &targetState); +#ifdef SUPPORT_GRAPHICS /** * @brief Execution the KeyDown callback of the ability * @param keyEvent Indicates the key-down event. @@ -142,6 +145,7 @@ public: * */ virtual void DoPointerEvent(std::shared_ptr& pointerEvent); +#endif /** * @brief Send the result code and data to be returned by this Page ability to the caller. @@ -356,9 +360,9 @@ public: bool IsStageBasedModel() const; int GetCompatibleVersion(); - +#ifdef SUPPORT_GRAPHICS void AfterUnFocused(); - +#endif protected: /** * @brief Toggles the lifecycle status of Ability to AAFwk::ABILITY_STATE_INACTIVE. And notifies the application @@ -389,6 +393,7 @@ protected: */ void Inactive(); +#ifdef SUPPORT_GRAPHICS /** * @brief Toggles the lifecycle status of Ability to AAFwk::ABILITY_STATE_INACTIVE. And notifies the application * that it belongs to of the lifecycle status. @@ -403,6 +408,7 @@ protected: * */ void Background(); +#endif /** * @brief SerUriString @@ -439,6 +445,7 @@ protected: std::shared_ptr handler_; private: +#ifdef SUPPORT_GRAPHICS class WindowLifeCycleImpl : public Rosen::IWindowLifeCycle { public: WindowLifeCycleImpl(const sptr& token, const std::shared_ptr& owner) @@ -462,6 +469,7 @@ public: private: std::shared_ptr abilityImpl_; }; +#endif typedef enum { START, INACTIVE, @@ -476,11 +484,12 @@ private: std::shared_ptr contextDeal_; private: +#ifdef SUPPORT_GRAPHICS /** * @brief Multimodal Events Register. */ void WindowEventRegister(); - +#endif bool hasSaveData_ = false; bool needSaveDate_ = false; PacMap restoreData_; diff --git a/frameworks/kits/ability/native/include/ability_lifecycle_observer.h b/frameworks/kits/ability/native/include/ability_lifecycle_observer.h index 25a66fef203..46d7cb3a6fc 100644 --- a/frameworks/kits/ability/native/include/ability_lifecycle_observer.h +++ b/frameworks/kits/ability/native/include/ability_lifecycle_observer.h @@ -32,6 +32,7 @@ public: */ virtual void OnActive(); +#ifdef SUPPORT_GRAPHICS /** * @brief Called back in response to an ON_BACKGROUND event. * When an ON_BACKGROUND event is received, the ability or ability slice is invisible. You are advised to @@ -49,6 +50,7 @@ public: * @param want Indicates the information for the ability or ability slice to go back to the ACTIVE state. */ virtual void OnForeground(const Want &want); +#endif /** * @brief Called back in response to an ON_INACTIVE event. diff --git a/frameworks/kits/ability/native/include/ability_lifecycle_observer_interface.h b/frameworks/kits/ability/native/include/ability_lifecycle_observer_interface.h index 35d72e7b37b..5f0035d5e73 100644 --- a/frameworks/kits/ability/native/include/ability_lifecycle_observer_interface.h +++ b/frameworks/kits/ability/native/include/ability_lifecycle_observer_interface.h @@ -33,6 +33,7 @@ public: */ virtual void OnActive() = 0; +#ifdef SUPPORT_GRAPHICS /** * @brief Called back in response to an ON_BACKGROUND event. * When an ON_BACKGROUND event is received, the ability or ability slice is invisible. You are advised to @@ -50,6 +51,7 @@ public: * @param want Indicates the information for the ability or ability slice to go back to the ACTIVE state. */ virtual void OnForeground(const Want &want) = 0; +#endif /** * @brief Called back in response to an ON_INACTIVE event. diff --git a/frameworks/kits/ability/native/include/ability_runtime/js_ability.h b/frameworks/kits/ability/native/include/ability_runtime/js_ability.h index 989495a6757..7beb83ed0b5 100755 --- a/frameworks/kits/ability/native/include/ability_runtime/js_ability.h +++ b/frameworks/kits/ability/native/include/ability_runtime/js_ability.h @@ -46,13 +46,14 @@ public: void OnStart(const Want &want) override; void OnStop() override; - +#ifdef SUPPORT_GRAPHICS void OnSceneCreated() override; void onSceneDestroyed() override; void OnSceneRestored() override; void OnForeground(const Want &want) override; void OnBackground() override; +#endif bool OnContinue(WantParams &wantParams) override; void OnConfigurationUpdated(const Configuration &configuration) override; void UpdateContextConfiguration() override; @@ -65,13 +66,16 @@ public: sptr CallRequest() override; protected: +#ifdef SUPPORT_GRAPHICS void DoOnForeground(const Want &want) override; void RequsetFocus(const Want &want) override; - +#endif private: void CallObjectMethod(const char *name, NativeValue *const *argv = nullptr, size_t argc = 0); std::unique_ptr CreateAppWindowStage(); +#ifdef SUPPORT_GRAPHICS void GetPageStackFromWant(const Want &want, std::string &pageStack); +#endif std::shared_ptr CreateADelegatorAbilityProperty(); JsRuntime &jsRuntime_; diff --git a/frameworks/kits/ability/native/include/ability_thread.h b/frameworks/kits/ability/native/include/ability_thread.h index 97a261f078a..f45f062c819 100644 --- a/frameworks/kits/ability/native/include/ability_thread.h +++ b/frameworks/kits/ability/native/include/ability_thread.h @@ -287,6 +287,7 @@ public: */ int BatchInsert(const Uri &uri, const std::vector &values); +#ifdef SUPPORT_GRAPHICS /** * @brief notify multi window mode changed. * @@ -301,6 +302,7 @@ public: * @param flag true: Indicates this ability is top active ability */ void NotifyTopActiveAbilityChanged(bool flag); +#endif /** * @brief continue ability to target device. diff --git a/frameworks/kits/ability/native/include/continuation/distributed/continuation_manager.h b/frameworks/kits/ability/native/include/continuation/distributed/continuation_manager.h index e47be5e1a0b..5223106b1c5 100644 --- a/frameworks/kits/ability/native/include/continuation/distributed/continuation_manager.h +++ b/frameworks/kits/ability/native/include/continuation/distributed/continuation_manager.h @@ -100,9 +100,9 @@ private: bool DoScheduleRestoreData(const WantParams &restoreData); bool DoRestoreFromRemote(const WantParams &restoreData); - +#ifdef SUPPORT_GRAPHICS bool GetContentInfo(WantParams &wantParams); - +#endif sptr continueToken_ = nullptr; std::weak_ptr ability_; std::weak_ptr abilityInfo_; diff --git a/frameworks/kits/ability/native/include/iability_callback.h b/frameworks/kits/ability/native/include/iability_callback.h index 7a4f8195fb7..cff577e2d15 100644 --- a/frameworks/kits/ability/native/include/iability_callback.h +++ b/frameworks/kits/ability/native/include/iability_callback.h @@ -22,11 +22,12 @@ class IAbilityCallback { public: IAbilityCallback() = default; virtual ~IAbilityCallback() = default; - +#ifdef SUPPORT_GRAPHICS /** * @brief Called back at ability context. */ virtual int GetCurrentWindowMode() = 0; +#endif }; } // namespace AppExecFwk } // namespace OHOS diff --git a/frameworks/kits/ability/native/src/ability.cpp b/frameworks/kits/ability/native/src/ability.cpp index 27160858b92..96a4467c2c1 100755 --- a/frameworks/kits/ability/native/src/ability.cpp +++ b/frameworks/kits/ability/native/src/ability.cpp @@ -37,15 +37,19 @@ #include "data_ability_predicates.h" #include "data_ability_result.h" #include "data_uri_utils.h" -#include "display_type.h" #include "distributed_objectstore.h" +#ifdef SUPPORT_GRAPHICS +#include "display_type.h" #include "form_host_client.h" #include "form_mgr.h" #include "form_provider_client.h" +#endif #include "if_system_ability_manager.h" #include "ipc_skeleton.h" #include "iservice_registry.h" +#ifdef SUPPORT_GRAPHICS #include "key_event.h" +#endif #include "ohos_application.h" #include "permission/permission.h" #include "permission/permission_kit.h" @@ -77,10 +81,12 @@ const std::string PERMISSION_REQUIRE_FORM = "ohos.permission.REQUIRE_FORM"; const std::string LAUNCHER_BUNDLE_NAME = "com.ohos.launcher"; const std::string LAUNCHER_ABILITY_NAME = "com.ohos.launcher.MainAbility"; +#ifdef SUPPORT_GRAPHICS static std::mutex formLock; constexpr int64_t SEC_TO_MILLISEC = 1000; constexpr int64_t MILLISEC_TO_NANOSEC = 1000000; +#endif constexpr int32_t DISTRIBUTED_OBJECT_TIMEOUT = 10000; Ability* Ability::Create(const std::unique_ptr& runtime) @@ -106,6 +112,7 @@ void Ability::Init(const std::shared_ptr &abilityInfo, const std::s handler_ = handler; AbilityContext::token_ = token; +#ifdef SUPPORT_GRAPHICS // page ability only. if (abilityInfo_->type == AbilityType::PAGE) { if (!abilityInfo_->isStageBasedModel) { @@ -139,6 +146,7 @@ void Ability::Init(const std::shared_ptr &abilityInfo, const std::s OHOS::sptr thisAbility(this); Rosen::DisplayManager::GetInstance().RegisterDisplayListener(thisAbility); } +#endif lifecycle_ = std::make_shared(); abilityLifecycleExecutor_ = std::make_shared(); if (abilityLifecycleExecutor_ != nullptr) { @@ -179,6 +187,7 @@ bool Ability::IsUpdatingConfigurations() return AbilityContext::IsUpdatingConfigurations(); } +#ifdef SUPPORT_GRAPHICS /** * @brief Informs the system of the time required for drawing this Page ability. * @@ -188,6 +197,7 @@ bool Ability::PrintDrawnCompleted() { return AbilityContext::PrintDrawnCompleted(); } +#endif /** * Will be called when ability start. You should override this function @@ -203,6 +213,7 @@ void Ability::OnStart(const Want &want) return; } +#ifdef SUPPORT_GRAPHICS if (abilityInfo_->type == AppExecFwk::AbilityType::PAGE) { Rosen::WindowType winType = Rosen::WindowType::WINDOW_TYPE_APP_MAIN_WINDOW; if (abilityInfo_->bundleName == SYSTEM_UI) { @@ -289,6 +300,7 @@ void Ability::OnStart(const Want &want) } } } +#endif SetWant(want); if (abilityLifecycleExecutor_ == nullptr) { @@ -339,6 +351,7 @@ void Ability::OnStop() void Ability::Destroy() { APP_LOGI("%{public}s begin.", __func__); +#ifdef SUPPORT_GRAPHICS // Release the scene. if (scene_ != nullptr) { scene_->GoDestroy(); @@ -350,6 +363,7 @@ void Ability::Destroy() if (abilityWindow_ != nullptr && abilityInfo_->type == AppExecFwk::AbilityType::PAGE) { abilityWindow_->OnPostAbilityStop(); // Ability will been released when window destroy. } +#endif APP_LOGI("%{public}s end.", __func__); } @@ -365,12 +379,14 @@ void Ability::OnActive() { BYTRACE_NAME(BYTRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); APP_LOGI("%{public}s begin.", __func__); +#ifdef SUPPORT_GRAPHICS if (abilityWindow_ != nullptr) { APP_LOGI("%{public}s begin abilityWindow_->OnPostAbilityActive.", __func__); abilityWindow_->OnPostAbilityActive(); APP_LOGI("%{public}s end abilityWindow_->OnPostAbilityActive.", __func__); } bWindowFocus_ = true; +#endif if (abilityLifecycleExecutor_ == nullptr) { APP_LOGE("Ability::OnActive error. abilityLifecycleExecutor_ == nullptr."); return; @@ -395,12 +411,14 @@ void Ability::OnInactive() { BYTRACE_NAME(BYTRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); APP_LOGI("%{public}s begin.", __func__); +#ifdef SUPPORT_GRAPHICS if (abilityWindow_ != nullptr && abilityInfo_->type == AppExecFwk::AbilityType::PAGE) { APP_LOGI("%{public}s begin abilityWindow_->OnPostAbilityInactive.", __func__); abilityWindow_->OnPostAbilityInactive(); APP_LOGI("%{public}s end abilityWindow_->OnPostAbilityInactive.", __func__); } bWindowFocus_ = false; +#endif if (abilityLifecycleExecutor_ == nullptr) { APP_LOGE("Ability::OnInactive error. abilityLifecycleExecutor_ == nullptr."); return; @@ -415,6 +433,7 @@ void Ability::OnInactive() APP_LOGI("%{public}s end.", __func__); } +#ifdef SUPPORT_GRAPHICS /** * @brief Called after instantiating WindowScene. * @@ -463,6 +482,7 @@ void Ability::OnForeground(const Want &want) DispatchLifecycleOnForeground(want); APP_LOGI("%{public}s end.", __func__); } +#endif bool Ability::IsRestoredInContinuation() const { @@ -532,6 +552,7 @@ void Ability::NotityContinuationResult(const Want& want, bool success) originDeviceId, sessionId, success, reverseContinuationSchedulerReplica_); } +#ifdef SUPPORT_GRAPHICS /** * @brief Called when this ability enters the STATE_BACKGROUND state. * @@ -581,6 +602,7 @@ void Ability::OnBackground() lifecycle_->DispatchLifecycle(LifeCycle::Event::ON_BACKGROUND); APP_LOGI("%{public}s end.", __func__); } +#endif /** * @brief Called when this Service ability is connected for the first time. @@ -704,6 +726,7 @@ ErrCode Ability::StartAbility(const Want &want, AbilityStartSetting abilityStart return err; } +#ifdef SUPPORT_GRAPHICS /** * @brief Called when a key is pressed. When any component in the Ability gains focus, the key-down event for * the component will be handled first. This callback will not be invoked if the callback triggered for the @@ -869,6 +892,7 @@ bool Ability::HasWindowFocus() return false; } +#endif /** * @description: Obtains api version based on ability. @@ -889,6 +913,7 @@ void Ability::SetCompatibleVersion(int32_t compatibleVersion) compatibleVersion_ = compatibleVersion; } +#ifdef SUPPORT_GRAPHICS /** * @brief Called when a key is lone pressed. * @@ -902,6 +927,7 @@ bool Ability::OnKeyPressAndHold(int keyCode, const std::shared_ptr &ke { return false; } +#endif /** * @brief Called back after permissions are requested by using @@ -920,6 +946,7 @@ void Ability::OnRequestPermissionsFromUserResult( int requestCode, const std::vector &permissions, const std::vector &grantResults) {} +#ifdef SUPPORT_GRAPHICS /** * @brief Called when this ability is about to leave the foreground and enter the background due to a user * operation, for example, when the user touches the Home key. @@ -927,6 +954,7 @@ void Ability::OnRequestPermissionsFromUserResult( */ void Ability::OnLeaveForeground() {} +#endif /** * @brief Obtains the MIME type matching the data specified by the URI of the Data ability. This method should be @@ -986,7 +1014,7 @@ void Ability::OnConfigurationUpdatedNotify(const Configuration &changeConfigurat std::unique_ptr resConfig(Global::Resource::CreateResConfig()); if (resConfig != nullptr) { APP_LOGI("make resource mgr data"); - +#ifdef SUPPORT_GRAPHICS if (!language.empty()) { UErrorCode status = U_ZERO_ERROR; icu::Locale locale = icu::Locale::forLanguageTag(language, status); @@ -995,7 +1023,7 @@ void Ability::OnConfigurationUpdatedNotify(const Configuration &changeConfigurat resConfig->SetLocaleInfo(locale); } } - +#endif resConfig->SetColorMode(ConvertColorMode(colormode)); auto resourceManager = GetResourceManager(); @@ -1004,14 +1032,14 @@ void Ability::OnConfigurationUpdatedNotify(const Configuration &changeConfigurat APP_LOGI("%{public}s Notify ResourceManager.", __func__); } } - +#ifdef SUPPORT_GRAPHICS // Notify WindowScene if (scene_ != nullptr && !language.empty()) { auto diffConfiguration = std::make_shared(changeConfiguration); scene_->UpdateConfiguration(diffConfiguration); APP_LOGE("%{public}s scene_ -> UpdateConfiguration success.", __func__); } - +#endif if (abilityContext_ != nullptr && application_ != nullptr) { abilityContext_->SetConfiguration(application_->GetConfiguration()); } @@ -1121,6 +1149,7 @@ bool Ability::IsTerminating() void Ability::OnAbilityResult(int requestCode, int resultCode, const Want &want) {} +#ifdef SUPPORT_GRAPHICS /** * @brief Called back when the Back key is pressed. * The default implementation destroys the ability. You can override this method. @@ -1140,6 +1169,7 @@ void Ability::OnBackPressed() } APP_LOGI("%{public}s end.", __func__); } +#endif /** * @brief Called when the launch mode of an ability is set to singleInstance. This happens when you re-launch an @@ -1238,6 +1268,7 @@ void Ability::SetResult(int resultCode, const Want &resultData) APP_LOGI("%{public}s end.", __func__); } +#ifdef SUPPORT_GRAPHICS /** * @brief Sets the type of audio whose volume will be adjusted by the volume button. * @@ -1245,6 +1276,7 @@ void Ability::SetResult(int resultCode, const Want &resultData) */ void Ability::SetVolumeTypeAdjustedByKey(int volumeType) {} +#endif /** * @brief Called back when Service is started. @@ -1647,6 +1679,7 @@ void Ability::SetMainRoute(const std::string &entry) void Ability::AddActionRoute(const std::string &action, const std::string &entry) {} +#ifdef SUPPORT_GRAPHICS /** * @brief Sets the background color of the window in RGB color mode. * @@ -1662,6 +1695,7 @@ int Ability::SetWindowBackgroundColor(int red, int green, int blue) { return -1; } +#endif /** * @brief Connects the current ability to an ability using the AbilityInfo.AbilityType.SERVICE template. @@ -1756,6 +1790,7 @@ bool Ability::OnContinue(WantParams &wantParams) return false; } +#ifdef SUPPORT_GRAPHICS /** * @brief Get page ability stack info. * @@ -1768,6 +1803,7 @@ std::string Ability::GetContentInfo() } return scene_->GetContentInfo(); } +#endif /** * @brief Migrates this ability to the given device on the same distributed network. The ability to migrate and its @@ -1932,6 +1968,7 @@ bool Ability::IsFlagExists(unsigned int flag, unsigned int flagSet) return (flag & flagSet) == flag; } +#ifdef SUPPORT_GRAPHICS /** * @brief Called when this ability gains or loses window focus. * @@ -1948,6 +1985,7 @@ void Ability::OnWindowFocusChanged(bool hasFocus) */ void Ability::OnTopActiveAbilityChanged(bool topActive) {} +#endif /** * @brief Called to set caller information for the application. The default implementation returns null. @@ -1985,6 +2023,7 @@ std::shared_ptr Ability::CreatePostEventTimeouter(std:: return std::make_shared(taskstr, handler_); } +#ifdef SUPPORT_GRAPHICS /** * Releases an obtained form by its ID. * @@ -2065,6 +2104,7 @@ bool Ability::DeleteForm(const int64_t formId) // delete form with formId return DeleteForm(formId, DELETE_FORM); } +#endif /** * @brief Keep this Service ability in the background and displays a notification bar. @@ -2090,6 +2130,7 @@ int Ability::StopBackgroundRunning() return BackgroundTaskMgr::BackgroundTaskMgrHelper::RequestStopBackgroundRunning(abilityInfo_->name, GetToken()); } +#ifdef SUPPORT_GRAPHICS /** * @brief Cast temp form with formId. * @@ -2967,6 +3008,7 @@ bool Ability::GetFormsInfoByModule(std::string &bundleName, std::string &moduleN return !formInfos.empty(); } +#endif /** * @brief Acquire a bundle manager, if it not existed. @@ -3005,6 +3047,7 @@ void Ability::SetBundleManager(const sptr &bundleManager) iBundleMgr_ = bundleManager; } +#ifdef SUPPORT_GRAPHICS /** * @brief Acquire a form provider remote object. * @return Returns form provider remote object. @@ -3024,6 +3067,7 @@ sptr Ability::GetFormRemoteObject() APP_LOGI("%{public}s end", __func__); return providerRemoteObject_; } +#endif /** * @brief Set the start ability setting. @@ -3051,10 +3095,12 @@ const AAFwk::LaunchParam& Ability::GetLaunchParam() const return launchParam_; } +#ifdef SUPPORT_GRAPHICS void Ability::SetSceneListener(const sptr &listener) { sceneListener_ = listener; } +#endif std::vector> Ability::ExecuteBatch( const std::vector> &operations) @@ -3389,6 +3435,7 @@ bool Ability::CheckAssertQueryResult(std::shared_ptr Ability::GetWindowOption(const Want &want) { APP_LOGI("%{public}s start", __func__); @@ -3431,6 +3478,7 @@ void Ability::DoOnForeground(const Want& want) } } +#endif /** * @brief request a remote object of callee from this ability. @@ -3441,6 +3489,7 @@ sptr Ability::CallRequest() return nullptr; } +#ifdef SUPPORT_GRAPHICS int Ability::GetCurrentWindowMode() { APP_LOGI("%{public}s start", __func__); @@ -3566,5 +3615,6 @@ void Ability::RequsetFocus(const Want &want) } abilityWindow_->OnPostAbilityForeground(sceneFlag_); } +#endif } // namespace AppExecFwk } // namespace OHOS diff --git a/frameworks/kits/ability/native/src/ability_impl.cpp b/frameworks/kits/ability/native/src/ability_impl.cpp index e4aed208c0b..07838d6382b 100755 --- a/frameworks/kits/ability/native/src/ability_impl.cpp +++ b/frameworks/kits/ability/native/src/ability_impl.cpp @@ -46,10 +46,12 @@ void AbilityImpl::Init(std::shared_ptr &application, const std: handler_ = handler; auto info = record->GetAbilityInfo(); isStageBasedModel_ = info && info->isStageBasedModel; +#ifdef SUPPORT_GRAPHICS if (info && info->type == AbilityType::PAGE) { ability_->SetSceneListener( sptr(new (std::nothrow) WindowLifeCycleImpl(token_, shared_from_this()))); } +#endif ability_->Init(record->GetAbilityInfo(), application, handler, token); lifecycleState_ = AAFwk::ABILITY_STATE_INITIAL; abilityLifecycleCallbacks_ = application; @@ -70,32 +72,37 @@ void AbilityImpl::Start(const Want &want) APP_LOGE("AbilityImpl::Start ability_ or abilityLifecycleCallbacks_ is nullptr"); return; } - +#ifdef SUPPORT_GRAPHICS if ((ability_->GetAbilityInfo()->type == AbilityType::PAGE) && (!ability_->GetAbilityInfo()->isStageBasedModel)) { ability_->HandleCreateAsContinuation(want); } - +#endif APP_LOGI("AbilityImpl::Start"); ability_->OnStart(want); +#ifdef SUPPORT_GRAPHICS if ((ability_->GetAbilityInfo()->type == AppExecFwk::AbilityType::PAGE) && (ability_->GetAbilityInfo()->isStageBasedModel)) { lifecycleState_ = AAFwk::ABILITY_STATE_STARTED_NEW; } else { +#endif if (ability_->GetAbilityInfo()->type == AbilityType::DATA) { lifecycleState_ = AAFwk::ABILITY_STATE_ACTIVE; } else { lifecycleState_ = AAFwk::ABILITY_STATE_INACTIVE; } +#ifdef SUPPORT_GRAPHICS } +#endif abilityLifecycleCallbacks_->OnAbilityStart(ability_); - +#ifdef SUPPORT_GRAPHICS // Multimodal Events Register if ((ability_->GetAbilityInfo()->type == AppExecFwk::AbilityType::PAGE) && (!ability_->GetAbilityInfo()->isStageBasedModel)) { WindowEventRegister(); } +#endif APP_LOGI("%{public}s end.", __func__); } @@ -113,12 +120,16 @@ void AbilityImpl::Stop() } ability_->OnStop(); +#ifdef SUPPORT_GRAPHICS if ((ability_->GetAbilityInfo()->type == AppExecFwk::AbilityType::PAGE) && (ability_->GetAbilityInfo()->isStageBasedModel)) { lifecycleState_ = AAFwk::ABILITY_STATE_STOPED_NEW; } else { +#endif lifecycleState_ = AAFwk::ABILITY_STATE_INITIAL; +#ifdef SUPPORT_GRAPHICS } +#endif abilityLifecycleCallbacks_->OnAbilityStop(ability_); ability_->Destroy(); // Release window and ability. ability_ = nullptr; @@ -140,12 +151,12 @@ void AbilityImpl::Active() APP_LOGI("AbilityImpl::Active"); ability_->OnActive(); - +#ifdef SUPPORT_GRAPHICS if ((lifecycleState_ == AAFwk::ABILITY_STATE_INACTIVE) && (ability_->GetAbilityInfo()->type == AbilityType::PAGE)) { ability_->OnTopActiveAbilityChanged(true); ability_->OnWindowFocusChanged(true); } - +#endif lifecycleState_ = AAFwk::ABILITY_STATE_ACTIVE; abilityLifecycleCallbacks_->OnAbilityActive(ability_); APP_LOGI("%{public}s end.", __func__); @@ -166,12 +177,12 @@ void AbilityImpl::Inactive() APP_LOGI("AbilityImpl::Inactive"); ability_->OnInactive(); - +#ifdef SUPPORT_GRAPHICS if ((lifecycleState_ == AAFwk::ABILITY_STATE_ACTIVE) && (ability_->GetAbilityInfo()->type == AbilityType::PAGE)) { ability_->OnTopActiveAbilityChanged(false); ability_->OnWindowFocusChanged(false); } - +#endif lifecycleState_ = AAFwk::ABILITY_STATE_INACTIVE; abilityLifecycleCallbacks_->OnAbilityInactive(ability_); APP_LOGI("%{public}s end.", __func__); @@ -191,6 +202,7 @@ int AbilityImpl::GetCompatibleVersion() return -1; } +#ifdef SUPPORT_GRAPHICS void AbilityImpl::AfterUnFocused() { APP_LOGI("%{public}s begin.", __func__); @@ -311,6 +323,7 @@ void AbilityImpl::Background() abilityLifecycleCallbacks_->OnAbilityBackground(ability_); APP_LOGI("%{public}s end.", __func__); } +#endif /** * @brief Save data and states of an ability when it is restored by the system. and Calling information back to Ability. @@ -428,6 +441,7 @@ int AbilityImpl::GetCurrentState() return lifecycleState_; } +#ifdef SUPPORT_GRAPHICS /** * @brief Execution the KeyDown callback of the ability * @param keyEvent Indicates the key-down event. @@ -466,6 +480,7 @@ void AbilityImpl::DoPointerEvent(std::shared_ptr& pointerEven { APP_LOGI("AbilityImpl::DoPointerEvent called"); } +#endif /** * @brief Send the result code and data to be returned by this Page ability to the caller. @@ -852,6 +867,7 @@ void AbilityImpl::ScheduleUpdateConfiguration(const Configuration &config) APP_LOGI("%{public}s end.", __func__); } +#ifdef SUPPORT_GRAPHICS void AbilityImpl::InputEventConsumerImpl::OnInputEvent(std::shared_ptr keyEvent) const { int32_t code = keyEvent->GetKeyAction(); @@ -885,6 +901,7 @@ void AbilityImpl::WindowEventRegister() } } } +#endif /** * @brief Create a PostEvent timeout task. The default delay is 5000ms diff --git a/frameworks/kits/ability/native/src/ability_impl_factory.cpp b/frameworks/kits/ability/native/src/ability_impl_factory.cpp index 0db5e6c59bf..07e80521bda 100644 --- a/frameworks/kits/ability/native/src/ability_impl_factory.cpp +++ b/frameworks/kits/ability/native/src/ability_impl_factory.cpp @@ -17,7 +17,9 @@ #include "app_log_wrapper.h" #include "data_ability_impl.h" #include "new_ability_impl.h" +#ifdef SUPPORT_GRAPHICS #include "page_ability_impl.h" +#endif #include "service_ability_impl.h" namespace OHOS { @@ -57,6 +59,7 @@ std::shared_ptr AbilityImplFactory::MakeAbilityImplObject(const std APP_LOGI("AbilityImplFactory::MakeAbilityImplObject type:%{public}d, isStageBasedModel:%{public}d", info->type, info->isStageBasedModel); switch (info->type) { +#ifdef SUPPORT_GRAPHICS case AppExecFwk::AbilityType::PAGE: if (info->isStageBasedModel) { abilityImpl = std::make_shared(); @@ -64,6 +67,7 @@ std::shared_ptr AbilityImplFactory::MakeAbilityImplObject(const std abilityImpl = std::make_shared(); } break; +#endif case AppExecFwk::AbilityType::SERVICE: abilityImpl = std::make_shared(); break; diff --git a/frameworks/kits/ability/native/src/ability_lifecycle.cpp b/frameworks/kits/ability/native/src/ability_lifecycle.cpp index 28c7ee112f8..8130f4d41a2 100644 --- a/frameworks/kits/ability/native/src/ability_lifecycle.cpp +++ b/frameworks/kits/ability/native/src/ability_lifecycle.cpp @@ -71,12 +71,14 @@ void LifeCycle::DispatchLifecycle(const LifeCycle::Event &event, const Want &wan if (callbacks_.size() != 0) { for (auto &callback : callbacks_) { switch (event) { +#ifdef SUPPORT_GRAPHICS case ON_FOREGROUND: { if (callback != nullptr) { callback->OnForeground(want); } break; } +#endif case ON_START: { if (callback != nullptr) { callback->OnStart(want); @@ -117,12 +119,14 @@ void LifeCycle::DispatchLifecycle(const LifeCycle::Event &event) } break; } +#ifdef SUPPORT_GRAPHICS case ON_BACKGROUND: { if (callback != nullptr) { callback->OnBackground(); } break; } +#endif case ON_INACTIVE: { if (callback != nullptr) { callback->OnInactive(); diff --git a/frameworks/kits/ability/native/src/ability_lifecycle_observer.cpp b/frameworks/kits/ability/native/src/ability_lifecycle_observer.cpp index 9c9b3d04766..129b017b32c 100644 --- a/frameworks/kits/ability/native/src/ability_lifecycle_observer.cpp +++ b/frameworks/kits/ability/native/src/ability_lifecycle_observer.cpp @@ -24,6 +24,7 @@ namespace AppExecFwk { void LifecycleObserver::OnActive() {} +#ifdef SUPPORT_GRAPHICS /** * @brief Called back in response to an ON_BACKGROUND event. * When an ON_BACKGROUND event is received, the ability or ability slice is invisible. You are advised to @@ -43,6 +44,7 @@ void LifecycleObserver::OnBackground() */ void LifecycleObserver::OnForeground(const Want &want) {} +#endif /** * @brief Called back in response to an ON_INACTIVE event. diff --git a/frameworks/kits/ability/native/src/ability_process.cpp b/frameworks/kits/ability/native/src/ability_process.cpp index 2f72f04fc98..6e75b42e5f0 100644 --- a/frameworks/kits/ability/native/src/ability_process.cpp +++ b/frameworks/kits/ability/native/src/ability_process.cpp @@ -21,11 +21,13 @@ namespace OHOS { namespace AppExecFwk { static void *g_handle = nullptr; +#ifdef SUPPORT_GRAPHICS #ifdef _ARM64_ constexpr char SHARED_LIBRARY_FEATURE_ABILITY[] = "/system/lib64/module/ability/libfeatureability.z.so"; #else constexpr char SHARED_LIBRARY_FEATURE_ABILITY[] = "/system/lib/module/ability/libfeatureability.z.so"; #endif +#endif constexpr char FUNC_CALL_ON_ABILITY_RESULT[] = "CallOnAbilityResult"; using NAPICallOnAbilityResult = void (*)(int requestCode, int resultCode, const Want &resultData, CallbackInfo cb); constexpr char FUNC_CALL_ON_REQUEST_PERMISSIONS_FROM_USERRESULT[] = "CallOnRequestPermissionsFromUserResult"; @@ -60,7 +62,7 @@ ErrCode AbilityProcess::StartAbility(Ability *ability, CallAbilityParam param, C APP_LOGE("AbilityProcess::StartAbility ability is nullptr"); return ERR_NULL_OBJECT; } - +#ifdef SUPPORT_GRAPHICS // inherit split mode auto windowMode = ability->GetCurrentWindowMode(); if (windowMode == AbilityWindowConfiguration::MULTI_WINDOW_DISPLAY_PRIMARY || @@ -68,7 +70,7 @@ ErrCode AbilityProcess::StartAbility(Ability *ability, CallAbilityParam param, C param.want.SetParam(Want::PARAM_RESV_WINDOW_MODE, windowMode); } APP_LOGI("window mode is %{public}d", windowMode); - +#endif ErrCode err = ERR_OK; if (param.forResultOption == true) { if (param.setting == nullptr) { @@ -124,7 +126,7 @@ void AbilityProcess::OnAbilityResult(Ability *ability, int requestCode, int resu return; } CallbackInfo callbackInfo = callback->second; - +#ifdef SUPPORT_GRAPHICS // start open featureability lib if (g_handle == nullptr) { g_handle = dlopen(SHARED_LIBRARY_FEATURE_ABILITY, RTLD_LAZY); @@ -136,7 +138,7 @@ void AbilityProcess::OnAbilityResult(Ability *ability, int requestCode, int resu return; } } - +#endif // get function auto func = reinterpret_cast(dlsym(g_handle, FUNC_CALL_ON_ABILITY_RESULT)); if (func == nullptr) { @@ -212,7 +214,7 @@ void AbilityProcess::OnRequestPermissionsFromUserResult(Ability *ability, int re return; } CallbackInfo callbackInfo = callback->second; - +#ifdef SUPPORT_GRAPHICS // start open featureability lib if (g_handle == nullptr) { g_handle = dlopen(SHARED_LIBRARY_FEATURE_ABILITY, RTLD_LAZY); @@ -224,7 +226,7 @@ void AbilityProcess::OnRequestPermissionsFromUserResult(Ability *ability, int re return; } } - +#endif // get function auto func = reinterpret_cast( dlsym(g_handle, FUNC_CALL_ON_REQUEST_PERMISSIONS_FROM_USERRESULT)); diff --git a/frameworks/kits/ability/native/src/ability_runtime/js_ability.cpp b/frameworks/kits/ability/native/src/ability_runtime/js_ability.cpp index 5e6d332fa63..5b913c122c8 100755 --- a/frameworks/kits/ability/native/src/ability_runtime/js_ability.cpp +++ b/frameworks/kits/ability/native/src/ability_runtime/js_ability.cpp @@ -26,15 +26,18 @@ #include "js_runtime.h" #include "js_runtime_utils.h" #include "napi_common_configuration.h" +#ifdef SUPPORT_GRAPHICS #include "js_window_stage.h" +#endif #include "napi_common_want.h" #include "napi_remote_object.h" #include "string_wrapper.h" namespace OHOS { namespace AbilityRuntime { +#ifdef SUPPORT_GRAPHICS const std::string PAGE_STACK_PROPERTY_NAME = "pageStack"; - +#endif Ability *JsAbility::Create(const std::unique_ptr &runtime) { return new JsAbility(static_cast(*runtime)); @@ -172,6 +175,7 @@ void JsAbility::OnStop() } } +#ifdef SUPPORT_GRAPHICS void JsAbility::OnSceneCreated() { Ability::OnSceneCreated(); @@ -263,6 +267,7 @@ void JsAbility::OnBackground() delegator->PostPerformBackground(CreateADelegatorAbilityProperty()); } } +#endif bool JsAbility::OnContinue(WantParams &wantParams) { @@ -447,6 +452,7 @@ void JsAbility::CallObjectMethod(const char *name, NativeValue *const *argv, siz nativeEngine.CallFunction(value, methodOnCreate, argv, argc); } +#ifdef SUPPORT_GRAPHICS std::unique_ptr JsAbility::CreateAppWindowStage() { HandleScope handleScope(jsRuntime_); @@ -539,6 +545,7 @@ void JsAbility::DoOnForeground(const Want &want) scene_->GoForeground(Ability::sceneFlag_); HILOG_INFO("%{public}s end scene_->GoForeground.", __func__); } +#endif std::shared_ptr JsAbility::CreateADelegatorAbilityProperty() { @@ -550,6 +557,7 @@ std::shared_ptr JsAbility::CreateADelegat return property; } +#ifdef SUPPORT_GRAPHICS void JsAbility::RequsetFocus(const Want &want) { HILOG_INFO("%{public}s called.", __func__); @@ -565,5 +573,6 @@ void JsAbility::RequsetFocus(const Want &want) } scene_->GoForeground(Ability::sceneFlag_); } +#endif } // namespace AbilityRuntime } // namespace OHOS diff --git a/frameworks/kits/ability/native/src/ability_runtime/js_ability_context.cpp b/frameworks/kits/ability/native/src/ability_runtime/js_ability_context.cpp index edfd6546923..0f2ca515af0 100755 --- a/frameworks/kits/ability/native/src/ability_runtime/js_ability_context.cpp +++ b/frameworks/kits/ability/native/src/ability_runtime/js_ability_context.cpp @@ -875,6 +875,7 @@ NativeValue* JsAbilityContext::WrapPermissionRequestResult(NativeEngine& engine, void JsAbilityContext::InheritWindowMode(AAFwk::Want &want) { HILOG_INFO("%{public}s called.", __func__); +#ifdef SUPPORT_GRAPHICS // only split mode need inherit auto context = context_.lock(); if (!context) { @@ -887,6 +888,7 @@ void JsAbilityContext::InheritWindowMode(AAFwk::Want &want) want.SetParam(Want::PARAM_RESV_WINDOW_MODE, windowMode); } HILOG_INFO("%{public}s called end. window mode is %{public}d", __func__, windowMode); +#endif } void JsAbilityContext::ConfigurationUpdated(NativeEngine* engine, std::shared_ptr &jsContext, diff --git a/frameworks/kits/ability/native/src/ability_thread.cpp b/frameworks/kits/ability/native/src/ability_thread.cpp index d177a6aded3..b562deca185 100644 --- a/frameworks/kits/ability/native/src/ability_thread.cpp +++ b/frameworks/kits/ability/native/src/ability_thread.cpp @@ -27,7 +27,9 @@ #include "data_ability_predicates.h" #include "dataobs_mgr_client.h" #include "ohos_application.h" +#ifdef SUPPORT_GRAPHICS #include "page_ability_impl.h" +#endif #include "values_bucket.h" namespace OHOS { @@ -38,9 +40,11 @@ constexpr static char ABILITY_NAME[] = "Ability"; constexpr static char ACE_ABILITY_NAME[] = "AceAbility"; constexpr static char ACE_SERVICE_ABILITY_NAME[] = "AceServiceAbility"; constexpr static char ACE_DATA_ABILITY_NAME[] = "AceDataAbility"; +#ifdef SUPPORT_GRAPHICS constexpr static char ACE_FORM_ABILITY_NAME[] = "AceFormAbility"; -constexpr static char BASE_SERVICE_EXTENSION[] = "ServiceExtension"; constexpr static char FORM_EXTENSION[] = "FormExtension"; +#endif +constexpr static char BASE_SERVICE_EXTENSION[] = "ServiceExtension"; constexpr static char STATIC_SUBSCRIBER_EXTENSION[] = "StaticSubscriberExtension"; constexpr static char DATA_SHARE_EXT_ABILITY[] = "DataShareExtAbility"; constexpr static char WORK_SCHEDULER_EXTENSION[] = "WorkSchedulerExtension"; @@ -89,7 +93,7 @@ std::string AbilityThread::CreateAbilityName(const std::shared_ptrname; } - +#ifdef SUPPORT_GRAPHICS if (abilityInfo->type == AbilityType::PAGE) { if (abilityInfo->isStageBasedModel) { abilityName = ABILITY_NAME; @@ -97,18 +101,27 @@ std::string AbilityThread::CreateAbilityName(const std::shared_ptrtype == AbilityType::SERVICE) { +#else + if (abilityInfo->type == AbilityType::SERVICE) { +#endif +#ifdef SUPPORT_GRAPHICS if (abilityInfo->formEnabled == true) { abilityName = ACE_FORM_ABILITY_NAME; } else { +#endif abilityName = ACE_SERVICE_ABILITY_NAME; +#ifdef SUPPORT_GRAPHICS } +#endif } else if (abilityInfo->type == AbilityType::DATA) { abilityName = ACE_DATA_ABILITY_NAME; } else if (abilityInfo->type == AbilityType::EXTENSION) { abilityName = BASE_SERVICE_EXTENSION; +#ifdef SUPPORT_GRAPHICS if (abilityInfo->formEnabled || abilityInfo->extensionAbilityType == ExtensionAbilityType::FORM) { abilityName = FORM_EXTENSION; } +#endif if (abilityInfo->extensionAbilityType == ExtensionAbilityType::STATICSUBSCRIBER) { abilityName = STATIC_SUBSCRIBER_EXTENSION; } @@ -1180,6 +1193,7 @@ int AbilityThread::BatchInsert(const Uri &uri, const std::vector AbilityThread::BuildAbilityConte return abilityContextImpl; } +#ifdef SUPPORT_GRAPHICS void AbilityThread::DumpAbilityInfo(const std::vector ¶ms, std::vector &info) { APP_LOGI("%{public}s begin.", __func__); @@ -1641,6 +1657,7 @@ void AbilityThread::DumpAbilityInfo(const std::vector ¶ms, std: APP_LOGI("localCallContainer need to get calls info."); } +#endif sptr AbilityThread::CallRequest() { diff --git a/frameworks/kits/ability/native/src/continuation/distributed/continuation_manager.cpp b/frameworks/kits/ability/native/src/continuation/distributed/continuation_manager.cpp index 92d95f336f5..dd9d17df3fb 100644 --- a/frameworks/kits/ability/native/src/continuation/distributed/continuation_manager.cpp +++ b/frameworks/kits/ability/native/src/continuation/distributed/continuation_manager.cpp @@ -35,8 +35,9 @@ const std::string PAGE_STACK_PROPERTY_NAME = "pageStack"; const int32_t CONTINUE_ABILITY_REJECTED = 29360197; const int32_t CONTINUE_SAVE_DATA_FAILED = 29360198; const int32_t CONTINUE_ON_CONTINUE_FAILED = 29360199; +#ifdef SUPPORT_GRAPHICS const int32_t CONTINUE_GET_CONTENT_FAILED = 29360200; - +#endif ContinuationManager::ContinuationManager() { progressState_ = ProgressState::INITIAL; @@ -166,12 +167,13 @@ int32_t ContinuationManager::OnContinueAndGetContent(WantParams &wantParams) auto abilityInfo = abilityInfo_.lock(); std::string &bundleName = abilityInfo->bundleName; ObjectStore::DistributedObjectStore::GetInstance(bundleName)->TriggerSync(); - +#ifdef SUPPORT_GRAPHICS status = GetContentInfo(wantParams); if (!status) { APP_LOGE("GetContentInfo failed."); return CONTINUE_GET_CONTENT_FAILED; } +#endif APP_LOGI("%{public}s called end", __func__); return ERR_OK; } @@ -195,6 +197,7 @@ int32_t ContinuationManager::OnContinue(WantParams &wantParams) } } +#ifdef SUPPORT_GRAPHICS bool ContinuationManager::GetContentInfo(WantParams &wantParams) { APP_LOGI("%{public}s called begin", __func__); @@ -216,6 +219,7 @@ bool ContinuationManager::GetContentInfo(WantParams &wantParams) APP_LOGI("%{public}s called end", __func__); return true; } +#endif void ContinuationManager::ContinueAbility(bool reversible, const std::string &deviceId) { diff --git a/frameworks/kits/ability/native/src/new_ability_impl.cpp b/frameworks/kits/ability/native/src/new_ability_impl.cpp index 78f08b58884..d32df82c14a 100644 --- a/frameworks/kits/ability/native/src/new_ability_impl.cpp +++ b/frameworks/kits/ability/native/src/new_ability_impl.cpp @@ -35,6 +35,7 @@ void NewAbilityImpl::HandleAbilityTransaction(const Want &want, const AAFwk::Lif targetState.state, targetState.isNewWant, targetState.sceneFlag); +#ifdef SUPPORT_GRAPHICS if ((lifecycleState_ == targetState.state) && !targetState.isNewWant) { if (ability_ != nullptr && targetState.state == AAFwk::ABILITY_STATE_FOREGROUND_NEW) { ability_->RequsetFocus(want); @@ -42,7 +43,7 @@ void NewAbilityImpl::HandleAbilityTransaction(const Want &want, const AAFwk::Lif APP_LOGE("Org lifeCycleState equals to Dst lifeCycleState."); return; } - +#endif SetLifeCycleStateInfo(targetState); if (lifecycleState_ == AAFwk::ABILITY_STATE_INITIAL) { @@ -51,10 +52,11 @@ void NewAbilityImpl::HandleAbilityTransaction(const Want &want, const AAFwk::Lif Start(want); CheckAndRestore(); } - +#ifdef SUPPORT_GRAPHICS if (ability_ != nullptr) { ability_->sceneFlag_ = targetState.sceneFlag; } +#endif bool ret = false; ret = AbilityTransaction(want, targetState); if (ret) { @@ -80,9 +82,11 @@ bool NewAbilityImpl::AbilityTransaction(const Want &want, const AAFwk::LifeCycle bool ret = true; switch (targetState.state) { case AAFwk::ABILITY_STATE_INITIAL: { +#ifdef SUPPORT_GRAPHICS if (lifecycleState_ == AAFwk::ABILITY_STATE_FOREGROUND_NEW) { Background(); } +#endif Stop(); break; } @@ -90,12 +94,16 @@ bool NewAbilityImpl::AbilityTransaction(const Want &want, const AAFwk::LifeCycle if (targetState.isNewWant) { NewWant(want); } +#ifdef SUPPORT_GRAPHICS Foreground(want); +#endif ret = false; break; } case AAFwk::ABILITY_STATE_BACKGROUND_NEW: { +#ifdef SUPPORT_GRAPHICS Background(); +#endif ret = false; break; } diff --git a/frameworks/kits/ability/native/src/service_ability_impl.cpp b/frameworks/kits/ability/native/src/service_ability_impl.cpp index edeea0f9489..cdd9d416971 100644 --- a/frameworks/kits/ability/native/src/service_ability_impl.cpp +++ b/frameworks/kits/ability/native/src/service_ability_impl.cpp @@ -43,7 +43,9 @@ void ServiceAbilityImpl::HandleAbilityTransaction(const Want &want, const AAFwk: switch (targetState.state) { case AAFwk::ABILITY_STATE_INITIAL: { if (lifecycleState_ == AAFwk::ABILITY_STATE_ACTIVE) { +#ifdef SUPPORT_GRAPHICS Background(); +#endif Stop(); } break; diff --git a/frameworks/kits/ability/native/test/BUILD.gn b/frameworks/kits/ability/native/test/BUILD.gn index 3191a85b5a0..99c2f07d85f 100644 --- a/frameworks/kits/ability/native/test/BUILD.gn +++ b/frameworks/kits/ability/native/test/BUILD.gn @@ -12,6 +12,7 @@ # limitations under the License. import("//build/test.gni") +import("//foundation/aafwk/standard/feature.gni") module_output_path = "ability_runtime/ability_test" @@ -33,7 +34,6 @@ config("module_private_config") { "//foundation/aafwk/standard/services/abilitymgr/include", "//utils/system/safwk/native/include", "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/include", - "//foundation/aafwk/standard/frameworks/kits/fmskit/native/include", "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include", "//foundation/distributeddatamgr/distributeddatamgr/interfaces/innerkits/app_distributeddata/include", @@ -54,6 +54,11 @@ config("module_private_config") { "APP_LOG_TAG = \"AbilityUnitTest\"", "LOG_DOMAIN = 0xD002201", ] + + if (ability_runtime_graphics) { + include_dirs += + [ "//foundation/aafwk/standard/frameworks/kits/fmskit/native/include" ] + } } config("module_ability_context_config") { @@ -70,7 +75,6 @@ config("module_ability_context_config") { "//foundation/aafwk/standard/frameworks/kits/ability/native/include", "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/include", "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", - "//foundation/multimodalinput/input/interfaces/native/innerkits/event/include", "//foundation/aafwk/standard/interfaces/innerkits/base/include", "//third_party/libuv/include", "//foundation/aafwk/standard/interfaces/innerkits/base/include/ohos/aafwk/base", @@ -113,7 +117,6 @@ ohos_unittest("ability_test") { "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", - "//foundation/graphic/standard:libwmclient", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//utils/native/base:utils", @@ -123,11 +126,15 @@ ohos_unittest("ability_test") { "ability_runtime:runtime", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", - "multimodalinput_base:libmmi-client", "native_appdatamgr:native_appdatafwk", "native_appdatamgr:native_dataability", "native_appdatamgr:native_rdb", ] + + if (ability_runtime_graphics) { + deps += [ "//foundation/graphic/standard:libwmclient" ] + external_deps += [ "multimodalinput_base:libmmi-client" ] + } } ohos_unittest("ability_lifecycle_test") { @@ -159,8 +166,11 @@ ohos_unittest("ability_lifecycle_test") { external_deps = [ "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", - "multimodalinput_base:libmmi-client", ] + + if (ability_runtime_graphics) { + external_deps += [ "multimodalinput_base:libmmi-client" ] + } } ohos_unittest("ability_lifecycle_executor_test") { @@ -191,13 +201,18 @@ ohos_unittest("ability_lifecycle_executor_test") { external_deps = [ "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", - "multimodalinput_base:libmmi-client", ] + + if (ability_runtime_graphics) { + external_deps += [ "multimodalinput_base:libmmi-client" ] + } } ohos_unittest("ability_context_for_task_dispacher_test") { module_out_path = module_output_path - sources = [ "unittest/ability_context_for_task_dispacher_test.cpp" ] + sources = [ + "unittest/ability_context_for_task_dispacher_test.cpp", + ] include_dirs = [ "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include" ] @@ -223,8 +238,11 @@ ohos_unittest("ability_context_for_task_dispacher_test") { external_deps = [ "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", - "multimodalinput_base:libmmi-client", ] + + if (ability_runtime_graphics) { + external_deps += [ "multimodalinput_base:libmmi-client" ] + } } ohos_unittest("ability_context_interface_test") { @@ -256,8 +274,11 @@ ohos_unittest("ability_context_interface_test") { external_deps = [ "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", - "multimodalinput_base:libmmi-client", ] + + if (ability_runtime_graphics) { + external_deps += [ "multimodalinput_base:libmmi-client" ] + } } ohos_unittest("ability_context_test") { @@ -295,8 +316,11 @@ ohos_unittest("ability_context_test") { external_deps = [ "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", - "multimodalinput_base:libmmi-client", ] + + if (ability_runtime_graphics) { + external_deps += [ "multimodalinput_base:libmmi-client" ] + } } ohos_unittest("page_ability_impl_test") { @@ -361,8 +385,11 @@ ohos_unittest("service_ability_impl_test") { external_deps = [ "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", - "multimodalinput_base:libmmi-client", ] + + if (ability_runtime_graphics) { + external_deps += [ "multimodalinput_base:libmmi-client" ] + } } ohos_unittest("scene_created_test") { @@ -372,7 +399,9 @@ ohos_unittest("scene_created_test") { configs = [ ":module_ability_context_config" ] - sources = [ "unittest/scene_created_test.cpp" ] + sources = [ + "unittest/scene_created_test.cpp", + ] deps = [ "${INNERKITS_PATH}/want:want", @@ -401,7 +430,9 @@ ohos_unittest("data_ability_helper_test") { module_out_path = module_output_path include_dirs = [ "//foundation/aafwk/standard/services/abilitymgr/include" ] - sources = [ "unittest/data_ability_helper_test.cpp" ] + sources = [ + "unittest/data_ability_helper_test.cpp", + ] configs = [ ":module_ability_context_config" ] @@ -422,16 +453,21 @@ ohos_unittest("data_ability_helper_test") { external_deps = [ "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", - "multimodalinput_base:libmmi-client", "native_appdatamgr:native_appdatafwk", "native_appdatamgr:native_dataability", "native_appdatamgr:native_rdb", ] + + if (ability_runtime_graphics) { + external_deps += [ "multimodalinput_base:libmmi-client" ] + } } ohos_unittest("data_ability_operation_test") { module_out_path = module_output_path - sources = [ "unittest/data_ability_operation_test.cpp" ] + sources = [ + "unittest/data_ability_operation_test.cpp", + ] configs = [ ":module_private_config" ] @@ -456,11 +492,14 @@ ohos_unittest("data_ability_operation_test") { external_deps = [ "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", - "multimodalinput_base:libmmi-client", "native_appdatamgr:native_appdatafwk", "native_appdatamgr:native_dataability", "native_appdatamgr:native_rdb", ] + + if (ability_runtime_graphics) { + external_deps += [ "multimodalinput_base:libmmi-client" ] + } } ohos_unittest("ability_impl_active_test") { @@ -469,7 +508,6 @@ ohos_unittest("ability_impl_active_test") { "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/src/app_loader.cpp", "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/src/application_context.cpp", "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/src/ohos_application.cpp", - "unittest/ability_impl_active_test.cpp", ] configs = [ ":module_private_config" ] @@ -496,8 +534,12 @@ ohos_unittest("ability_impl_active_test") { "ability_runtime:runtime", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", - "multimodalinput_base:libmmi-client", ] + + if (ability_runtime_graphics) { + sources += [ "unittest/ability_impl_active_test.cpp" ] + external_deps += [ "multimodalinput_base:libmmi-client" ] + } } ohos_unittest("ability_impl_test") { @@ -506,7 +548,6 @@ ohos_unittest("ability_impl_test") { "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/src/app_loader.cpp", "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/src/application_context.cpp", "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/src/ohos_application.cpp", - "unittest/ability_impl_test.cpp", ] configs = [ ":module_private_config" ] @@ -537,11 +578,15 @@ ohos_unittest("ability_impl_test") { "bundle_framework:appexecfwk_core", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", - "multimodalinput_base:libmmi-client", "native_appdatamgr:native_appdatafwk", "native_appdatamgr:native_dataability", "native_appdatamgr:native_rdb", ] + + if (ability_runtime_graphics) { + sources += [ "unittest/ability_impl_test.cpp" ] + external_deps += [ "multimodalinput_base:libmmi-client" ] + } } ohos_unittest("ability_thread_test") { @@ -577,7 +622,6 @@ ohos_unittest("ability_thread_test") { "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", - "//foundation/graphic/standard:libwmclient", "//third_party/googletest:gtest_main", "//utils/native/base:utils", ] @@ -586,11 +630,15 @@ ohos_unittest("ability_thread_test") { "ability_runtime:runtime", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", - "multimodalinput_base:libmmi-client", "native_appdatamgr:native_appdatafwk", "native_appdatamgr:native_dataability", "native_appdatamgr:native_rdb", ] + + if (ability_runtime_graphics) { + deps += [ "//foundation/graphic/standard:libwmclient" ] + external_deps += [ "multimodalinput_base:libmmi-client" ] + } } ohos_unittest("form_provider_client_test") { @@ -666,7 +714,6 @@ ohos_unittest("data_ability_impl_test") { "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", - "//foundation/graphic/standard:libwmclient", "//third_party/googletest:gtest_main", "//utils/native/base:utils", ] @@ -675,11 +722,15 @@ ohos_unittest("data_ability_impl_test") { "ability_runtime:runtime", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", - "multimodalinput_base:libmmi-client", "native_appdatamgr:native_appdatafwk", "native_appdatamgr:native_dataability", "native_appdatamgr:native_rdb", ] + + if (ability_runtime_graphics) { + deps += [ "//foundation/graphic/standard:libwmclient" ] + external_deps += [ "multimodalinput_base:libmmi-client" ] + } } ohos_unittest("data_ability_impl_file_secondpart_test") { @@ -713,7 +764,6 @@ ohos_unittest("data_ability_impl_file_secondpart_test") { "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", - "//foundation/graphic/standard:libwmclient", "//third_party/googletest:gtest_main", "//utils/native/base:utils", ] @@ -722,11 +772,15 @@ ohos_unittest("data_ability_impl_file_secondpart_test") { "ability_runtime:runtime", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", - "multimodalinput_base:libmmi-client", "native_appdatamgr:native_appdatafwk", "native_appdatamgr:native_dataability", "native_appdatamgr:native_rdb", ] + + if (ability_runtime_graphics) { + deps += [ "//foundation/graphic/standard:libwmclient" ] + external_deps += [ "multimodalinput_base:libmmi-client" ] + } } ohos_unittest("data_ability_impl_file_test") { @@ -760,7 +814,6 @@ ohos_unittest("data_ability_impl_file_test") { "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", - "//foundation/graphic/standard:libwmclient", "//third_party/googletest:gtest_main", "//utils/native/base:utils", ] @@ -769,11 +822,15 @@ ohos_unittest("data_ability_impl_file_test") { "ability_runtime:runtime", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", - "multimodalinput_base:libmmi-client", "native_appdatamgr:native_appdatafwk", "native_appdatamgr:native_dataability", "native_appdatamgr:native_rdb", ] + + if (ability_runtime_graphics) { + deps += [ "//foundation/graphic/standard:libwmclient" ] + external_deps += [ "multimodalinput_base:libmmi-client" ] + } } ohos_unittest("ability_thread_dataability_test") { @@ -809,7 +866,6 @@ ohos_unittest("ability_thread_dataability_test") { "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", - "//foundation/graphic/standard:libwmclient", "//third_party/googletest:gtest_main", "//utils/native/base:utils", ] @@ -818,11 +874,15 @@ ohos_unittest("ability_thread_dataability_test") { "ability_runtime:runtime", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", - "multimodalinput_base:libmmi-client", "native_appdatamgr:native_appdatafwk", "native_appdatamgr:native_dataability", "native_appdatamgr:native_rdb", ] + + if (ability_runtime_graphics) { + deps += [ "//foundation/graphic/standard:libwmclient" ] + external_deps += [ "multimodalinput_base:libmmi-client" ] + } } config("data_uri_utils_test_config") { @@ -865,13 +925,18 @@ ohos_unittest("data_uri_utils_test") { external_deps = [ "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", - "multimodalinput_base:libmmi-client", ] + + if (ability_runtime_graphics) { + external_deps += [ "multimodalinput_base:libmmi-client" ] + } } ohos_unittest("pac_map_test") { module_out_path = module_output_path - sources = [ "//foundation/aafwk/standard/frameworks/kits/ability/native/test/unittest/pac_map_test.cpp" ] + sources = [ + "//foundation/aafwk/standard/frameworks/kits/ability/native/test/unittest/pac_map_test.cpp", + ] configs = [ ":module_private_config" ] @@ -887,8 +952,11 @@ ohos_unittest("pac_map_test") { external_deps = [ "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", - "multimodalinput_base:libmmi-client", ] + + if (ability_runtime_graphics) { + external_deps += [ "multimodalinput_base:libmmi-client" ] + } } ohos_unittest("ability_permission_test") { @@ -921,13 +989,17 @@ ohos_unittest("ability_permission_test") { "bundle_framework:appexecfwk_core", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", - "multimodalinput_base:libmmi-client", ] + if (ability_runtime_graphics) { + external_deps += [ "multimodalinput_base:libmmi-client" ] + } } ohos_unittest("task_handler_client_test") { module_out_path = module_output_path - sources = [ "//foundation/aafwk/standard/frameworks/kits/ability/native/test/unittest/task_handler_client_test.cpp" ] + sources = [ + "//foundation/aafwk/standard/frameworks/kits/ability/native/test/unittest/task_handler_client_test.cpp", + ] configs = [ ":module_private_config" ] @@ -940,16 +1012,18 @@ ohos_unittest("task_handler_client_test") { "//utils/native/base:utils", ] - external_deps = [ - "hiviewdfx_hilog_native:libhilog", - "multimodalinput_base:libmmi-client", - ] + external_deps = [ "hiviewdfx_hilog_native:libhilog" ] + if (ability_runtime_graphics) { + external_deps += [ "multimodalinput_base:libmmi-client" ] + } } ohos_unittest("ability_thread_for_ability_on_configuration_update") { module_out_path = module_output_path - sources = [ "//foundation/aafwk/standard/frameworks/kits/ability/native/test/unittest/ability_thread_for_ability_on_configuration_update.cpp" ] + sources = [ + "//foundation/aafwk/standard/frameworks/kits/ability/native/test/unittest/ability_thread_for_ability_on_configuration_update.cpp", + ] configs = [ ":module_private_config" ] @@ -968,13 +1042,18 @@ ohos_unittest("ability_thread_for_ability_on_configuration_update") { external_deps = [ "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", - "multimodalinput_base:libmmi-client", ] + + if (ability_runtime_graphics) { + external_deps += [ "multimodalinput_base:libmmi-client" ] + } } ohos_unittest("data_ability_result_test") { module_out_path = module_output_path - sources = [ "//foundation/aafwk/standard/frameworks/kits/ability/native/test/unittest/data_ability_result_test.cpp" ] + sources = [ + "//foundation/aafwk/standard/frameworks/kits/ability/native/test/unittest/data_ability_result_test.cpp", + ] configs = [ ":module_private_config" ] @@ -988,8 +1067,11 @@ ohos_unittest("data_ability_result_test") { external_deps = [ "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", - "multimodalinput_base:libmmi-client", ] + + if (ability_runtime_graphics) { + external_deps += [ "multimodalinput_base:libmmi-client" ] + } } ohos_unittest("form_host_client_test") { @@ -1071,11 +1153,14 @@ ohos_unittest("continuation_test") { "ability_runtime:runtime", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", - "multimodalinput_base:libmmi-client", "native_appdatamgr:native_appdatafwk", "native_appdatamgr:native_dataability", "native_appdatamgr:native_rdb", ] + + if (ability_runtime_graphics) { + external_deps += [ "multimodalinput_base:libmmi-client" ] + } } ############################################################################### @@ -1103,12 +1188,17 @@ group("unittest") { ":data_ability_operation_test", ":data_ability_result_test", ":data_uri_utils_test", - ":form_host_client_test", - ":form_provider_client_test", ":pac_map_test", - ":page_ability_impl_test", ":service_ability_impl_test", ":task_handler_client_test", ] + + if (ability_runtime_graphics) { + deps += [ + ":form_host_client_test", + ":form_provider_client_test", + ":page_ability_impl_test", + ] + } } ############################################################################### diff --git a/frameworks/kits/ability/native/test/mock/include/mock_ability.cpp b/frameworks/kits/ability/native/test/mock/include/mock_ability.cpp index 61b0a03e70b..438b69891f5 100644 --- a/frameworks/kits/ability/native/test/mock/include/mock_ability.cpp +++ b/frameworks/kits/ability/native/test/mock/include/mock_ability.cpp @@ -32,11 +32,12 @@ void Ability::Init(std::shared_ptr &abilityInfo, const std::shared_ abilityInfo_ = abilityInfo; handler_ = handler; AbilityContext::token_ = token; - +#ifdef SUPPORT_GRAPHICS // page ability only. if (abilityInfo_->type == AbilityType::PAGE) { abilityWindow_ = std::make_shared(); } +#endif lifecycle_ = std::make_shared(); abilityLifecycleExecutor_ = std::make_shared(); application_ = application; @@ -66,6 +67,7 @@ void Ability::OnActive() void Ability::OnInactive() {} +#ifdef SUPPORT_GRAPHICS void Ability::OnForeground(const Want &want) { return; @@ -75,6 +77,7 @@ void Ability::OnBackground() { return; } +#endif sptr Ability::OnConnect(const Want &want) { @@ -99,6 +102,7 @@ void Ability::StartAbility(const Want &want, AbilityStartSetting abilityStartSet return; } +#ifdef SUPPORT_GRAPHICS bool Ability::OnKeyDown(int keyCode, const KeyEvent &keyEvent) { return false; @@ -177,6 +181,7 @@ bool Ability::OnKeyPressAndHold(int keyCode, const std::shared_ptr &ke { return false; } +#endif void Ability::OnRequestPermissionsFromUserResult( int requestCode, const std::vector &permissions, const std::vector &grantResults) @@ -184,10 +189,12 @@ void Ability::OnRequestPermissionsFromUserResult( return; } +#ifdef SUPPORT_GRAPHICS void Ability::OnLeaveForeground() { return; } +#endif std::string Ability::GetType(const Uri &uri) { @@ -265,10 +272,12 @@ void Ability::OnEventDispatch() return; } +#ifdef SUPPORT_GRAPHICS void Ability::OnWindowFocusChanged(bool hasFocus) { return; } +#endif void Ability::SetWant(const AAFwk::Want &want) { @@ -293,10 +302,12 @@ void Ability::SetResult(int resultCode, const Want &resultData) } } +#ifdef SUPPORT_GRAPHICS void Ability::SetVolumeTypeAdjustedByKey(int volumeType) { return; } +#endif void Ability::OnCommand(const AAFwk::Want &want, bool restart, int startId) { @@ -430,9 +441,11 @@ void Ability::AddActionRoute(const std::string &action, const std::string &entry return; } +#ifdef SUPPORT_GRAPHICS int Ability::SetWindowBackgroundColor(int red, int green, int blue) { return -1; } +#endif } // namespace AppExecFwk } // namespace OHOS diff --git a/frameworks/kits/ability/native/test/mock/include/mock_ability_impl.h b/frameworks/kits/ability/native/test/mock/include/mock_ability_impl.h index d3b8b293b61..2c8adc7c9d2 100644 --- a/frameworks/kits/ability/native/test/mock/include/mock_ability_impl.h +++ b/frameworks/kits/ability/native/test/mock/include/mock_ability_impl.h @@ -49,6 +49,7 @@ public: this->Inactive(); } +#ifdef SUPPORT_GRAPHICS void ImplForeground(const Want &want) { this->Foreground(want); @@ -58,6 +59,7 @@ public: { this->Background(); } +#endif void SetlifecycleState(int state) { diff --git a/frameworks/kits/ability/native/test/mock/include/mock_ability_manager_client.h b/frameworks/kits/ability/native/test/mock/include/mock_ability_manager_client.h index c5d85822a23..eed7cd89a90 100755 --- a/frameworks/kits/ability/native/test/mock/include/mock_ability_manager_client.h +++ b/frameworks/kits/ability/native/test/mock/include/mock_ability_manager_client.h @@ -106,8 +106,10 @@ public: { return true; }; +#ifdef SUPPORT_GRAPHICS virtual void NotifyMultiWinModeChanged(int32_t winModeKey, bool flag) {}; virtual void NotifyTopActiveAbilityChanged(bool flag) {}; +#endif virtual bool ScheduleNotifyChange(const Uri &uri) { return true; diff --git a/frameworks/kits/ability/native/test/mock/include/mock_ability_scheduler_for_observer.h b/frameworks/kits/ability/native/test/mock/include/mock_ability_scheduler_for_observer.h index b5c7d3e35c2..87421c93815 100755 --- a/frameworks/kits/ability/native/test/mock/include/mock_ability_scheduler_for_observer.h +++ b/frameworks/kits/ability/native/test/mock/include/mock_ability_scheduler_for_observer.h @@ -52,8 +52,10 @@ public: MOCK_METHOD2(BatchInsert, int(const Uri &, const std::vector &)); MOCK_METHOD1(DenormalizeUri, Uri(const Uri &)); MOCK_METHOD1(NormalizeUri, Uri(const Uri &)); +#ifdef SUPPORT_GRAPHICS MOCK_METHOD1(NotifyTopActiveAbilityChanged, void(bool flag)); MOCK_METHOD2(NotifyMultiWinModeChanged, void(int32_t winModeKey, bool flag)); +#endif MOCK_METHOD2(ScheduleRegisterObserver, bool(const Uri &uri, const sptr &dataObserver)); MOCK_METHOD2(ScheduleUnregisterObserver, bool(const Uri &uri, const sptr &dataObserver)); MOCK_METHOD1(ScheduleNotifyChange, bool(const Uri &uri)); diff --git a/frameworks/kits/ability/native/test/mock/include/mock_lifecycle_observer.h b/frameworks/kits/ability/native/test/mock/include/mock_lifecycle_observer.h index 589718ba388..67f7c8320ca 100644 --- a/frameworks/kits/ability/native/test/mock/include/mock_lifecycle_observer.h +++ b/frameworks/kits/ability/native/test/mock/include/mock_lifecycle_observer.h @@ -38,6 +38,7 @@ public: GTEST_LOG_(INFO) << "MockLifecycleObserver::OnActive called"; } +#ifdef SUPPORT_GRAPHICS /** * Called back in response to an ON_BACKGROUND event. * When an ON_BACKGROUND event is received, the ability or ability slice is invisible. You are advised to @@ -63,6 +64,7 @@ public: (void)want; GTEST_LOG_(INFO) << "MockLifecycleObserver::OnForeground called"; } +#endif /** * Called back in response to an ON_INACTIVE event. diff --git a/frameworks/kits/ability/native/test/mock/include/mock_replace_ability_impl.cpp b/frameworks/kits/ability/native/test/mock/include/mock_replace_ability_impl.cpp index 5edeb91b6d4..f3cc137941d 100644 --- a/frameworks/kits/ability/native/test/mock/include/mock_replace_ability_impl.cpp +++ b/frameworks/kits/ability/native/test/mock/include/mock_replace_ability_impl.cpp @@ -86,6 +86,7 @@ void AbilityImpl::Inactive() GTEST_LOG_(INFO) << "Mock AbilityImpl::Inactive called"; } +#ifdef SUPPORT_GRAPHICS void AbilityImpl::Foreground(const Want &want) { GTEST_LOG_(INFO) << "Mock AbilityImpl::Foreground called"; @@ -95,6 +96,7 @@ void AbilityImpl::Background() { GTEST_LOG_(INFO) << "Mock AbilityImpl::Background called"; } +#endif void AbilityImpl::DispatchSaveAbilityState() { @@ -132,11 +134,13 @@ int AbilityImpl::GetCurrentState() return lifecycleState_; } +#ifdef SUPPORT_GRAPHICS void AbilityImpl::DoKeyDown(const std::shared_ptr& keyEvent) {} void AbilityImpl::DoKeyUp(const std::shared_ptr& keyEvent) {} void AbilityImpl::DoPointerEvent(std::shared_ptr& pointerEvent) {} +#endif void AbilityImpl::SendResult(int requestCode, int resultCode, const Want &resultData) { diff --git a/frameworks/kits/appkit/BUILD.gn b/frameworks/kits/appkit/BUILD.gn index 897852b7f1a..36de998789d 100644 --- a/frameworks/kits/appkit/BUILD.gn +++ b/frameworks/kits/appkit/BUILD.gn @@ -13,6 +13,7 @@ import("//build/ohos.gni") import("//foundation/aafwk/standard/aafwk.gni") +import("//foundation/aafwk/standard/feature.gni") config("appkit_config") { defines = [ @@ -37,10 +38,15 @@ config("appkit_public_config") { visibility = [ ":*" ] include_dirs = [ "//base/global/resmgr_standard/interfaces/innerkits/include", - "//base/global/i18n_standard/frameworks/intl/include", - "//third_party/icu/icu4c/source/common", "${aafwk_path}/frameworks/kits/appkit/native/ability_delegator/include", ] + + if (ability_runtime_graphics) { + include_dirs += [ + "//base/global/i18n_standard/frameworks/intl/include", + "//third_party/icu/icu4c/source/common", + ] + } } #build bin @@ -65,7 +71,9 @@ ohos_executable("appexec") { configs = [ ":appkit_config" ] - sources = [ "${aafwk_path}/frameworks/kits/appkit/native/app/src/main.cpp" ] + sources = [ + "${aafwk_path}/frameworks/kits/appkit/native/app/src/main.cpp", + ] deps = [ "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", @@ -152,13 +160,10 @@ ohos_shared_library("appkit_native") { "//base/hiviewdfx/faultloggerd/interfaces/innerkits/dump_catcher:lib_dfx_dump_catcher", "//base/hiviewdfx/faultloggerd/interfaces/innerkits/faultloggerd_client:libfaultloggerd", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", - "//foundation/multimodalinput/input/frameworks/proxy:libmmi-client", - "//third_party/icu/icu4c:shared_icuuc", "//utils/native/base:utils", ] public_deps = [ - "//base/global/i18n_standard/frameworks/intl:intl_util", "//base/global/resmgr_standard/frameworks/resmgr:global_resmgr", ] external_deps = [ @@ -173,6 +178,13 @@ ohos_shared_library("appkit_native") { "napi:ace_napi", ] + if (ability_runtime_graphics) { + deps += [ + "//foundation/multimodalinput/input/frameworks/proxy:libmmi-client", + "//third_party/icu/icu4c:shared_icuuc", + ] + public_deps += [ "//base/global/i18n_standard/frameworks/intl:intl_util" ] + } part_name = "ability_runtime" } @@ -215,14 +227,11 @@ ohos_shared_library("app_context") { "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//base/hiviewdfx/hiview/adapter/utility:hiview_adapter_utility", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", - "//foundation/multimodalinput/input/frameworks/proxy:libmmi-client", - "//third_party/icu/icu4c:shared_icuuc", "//utils/native/base:utils", ] public_deps = [ "//base/account/os_account/frameworks/osaccount/native:os_account_innerkits", - "//base/global/i18n_standard/frameworks/intl:intl_util", "//base/global/resmgr_standard/frameworks/resmgr:global_resmgr", ] @@ -236,6 +245,13 @@ ohos_shared_library("app_context") { "resmgr_standard:resmgr_napi_core", ] + if (ability_runtime_graphics) { + deps += [ + "//foundation/multimodalinput/input/frameworks/proxy:libmmi-client", + "//third_party/icu/icu4c:shared_icuuc", + ] + public_deps += [ "//base/global/i18n_standard/frameworks/intl:intl_util" ] + } part_name = "ability_runtime" } @@ -284,7 +300,6 @@ ohos_shared_library("appkit_delegator") { "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", - "//third_party/icu/icu4c:shared_icuuc", "//utils/native/base:utils", ] @@ -296,7 +311,12 @@ ohos_shared_library("appkit_delegator") { "ipc:ipc_core", ] - public_deps = [ "//foundation/ace/napi:ace_napi" ] + public_deps = [ + "//foundation/ace/napi:ace_napi", + ] + if (ability_runtime_graphics) { + deps += [ "//third_party/icu/icu4c:shared_icuuc" ] + } part_name = "ability_runtime" } diff --git a/frameworks/kits/appkit/native/ability_runtime/context/context_impl.cpp b/frameworks/kits/appkit/native/ability_runtime/context/context_impl.cpp index 732cd457655..35f0dd16b00 100644 --- a/frameworks/kits/appkit/native/ability_runtime/context/context_impl.cpp +++ b/frameworks/kits/appkit/native/ability_runtime/context/context_impl.cpp @@ -22,7 +22,9 @@ #include "hilog_wrapper.h" #include "ipc_singleton.h" #include "js_runtime_utils.h" +#ifdef SUPPORT_GRAPHICS #include "locale_config.h" +#endif #include "os_account_manager.h" #include "sys_mgr_client.h" #include "system_ability_definition.h" @@ -280,6 +282,7 @@ void ContextImpl::InitResourceManager( } std::unique_ptr resConfig(Global::Resource::CreateResConfig()); +#ifdef SUPPORT_GRAPHICS UErrorCode status = U_ZERO_ERROR; icu::Locale locale = icu::Locale::forLanguageTag(Global::I18n::LocaleConfig::GetSystemLanguage(), status); resConfig->SetLocaleInfo(locale); @@ -291,6 +294,7 @@ void ContextImpl::InitResourceManager( } else { HILOG_ERROR("ContextImpl::InitResourceManager language: GetLocaleInfo is null."); } +#endif resourceManager->UpdateResConfig(*resConfig); appContext->SetResourceManager(resourceManager); } diff --git a/frameworks/kits/appkit/native/app/src/main_thread.cpp b/frameworks/kits/appkit/native/app/src/main_thread.cpp index ee72cf05cd8..7a124eca64d 100644 --- a/frameworks/kits/appkit/native/app/src/main_thread.cpp +++ b/frameworks/kits/appkit/native/app/src/main_thread.cpp @@ -31,11 +31,13 @@ #include "context_deal.h" #include "context_impl.h" #include "extension_module_loader.h" +#ifdef SUPPORT_GRAPHICS #include "form_extension.h" +#include "locale_config.h" +#endif #include "if_system_ability_manager.h" #include "iservice_registry.h" #include "js_runtime.h" -#include "locale_config.h" #include "ohos_application.h" #include "resource_manager.h" #include "runtime.h" @@ -759,6 +761,7 @@ bool MainThread::InitResourceManager(std::shared_ptr resConfig(Global::Resource::CreateResConfig()); APP_LOGI("MainThread::handleLaunchApplication after Resource::CreateResConfig."); +#ifdef SUPPORT_GRAPHICS#ifdef SUPPORT_GRAPHICS UErrorCode status = U_ZERO_ERROR; icu::Locale locale = icu::Locale::forLanguageTag(Global::I18n::LocaleConfig::GetSystemLanguage(), status); resConfig->SetLocaleInfo(locale); @@ -774,7 +777,7 @@ bool MainThread::InitResourceManager(std::shared_ptrSetColorMode(ConvertColorMode(colormode)); - +#endif APP_LOGI("MainThread::handleLaunchApplication. Start calling UpdateResConfig."); resourceManager->UpdateResConfig(*resConfig); APP_LOGI("MainThread::handleLaunchApplication. End calling UpdateResConfig."); @@ -935,9 +938,11 @@ void MainThread::HandleLaunchApplication(const AppLaunchData &appLaunchData, con AbilityLoader::GetInstance().RegisterAbility("Ability", [application = application_]() { return Ability::Create(application->GetRuntime()); }); +#ifdef SUPPORT_GRAPHICS AbilityLoader::GetInstance().RegisterExtension("FormExtension", [application = application_]() { return AbilityRuntime::FormExtension::Create(application->GetRuntime()); }); +#endif AbilityLoader::GetInstance().RegisterExtension("StaticSubscriberExtension", [application = application_]() { return AbilityRuntime::StaticSubscriberExtension::Create(application->GetRuntime()); }); diff --git a/frameworks/kits/appkit/native/test/BUILD.gn b/frameworks/kits/appkit/native/test/BUILD.gn index a3c3703ac23..97ba162a15c 100644 --- a/frameworks/kits/appkit/native/test/BUILD.gn +++ b/frameworks/kits/appkit/native/test/BUILD.gn @@ -13,6 +13,7 @@ import("//build/test.gni") import("//foundation/aafwk/standard/aafwk.gni") +import("//foundation/aafwk/standard/feature.gni") module_output_path = "ability_runtime/application_test" #APP_INNERKITS_PATH = "//foundation/appexecfwk/standard/interfaces/innerkits" @@ -95,7 +96,6 @@ ohos_unittest("context_deal_interface_test") { "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", - "//foundation/multimodalinput/input/frameworks/proxy:libmmi-client", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//utils/native/base:utils", @@ -105,6 +105,11 @@ ohos_unittest("context_deal_interface_test") { "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] + + if (ability_runtime_graphics) { + deps += + [ "//foundation/multimodalinput/input/frameworks/proxy:libmmi-client" ] + } } ohos_unittest("application_test") { @@ -184,7 +189,9 @@ ohos_unittest("context_container_test") { ohos_unittest("application_context_for_task_dispacher_test") { module_out_path = module_output_path - sources = [ "unittest/application_context_for_task_dispacher_test.cpp" ] + sources = [ + "unittest/application_context_for_task_dispacher_test.cpp", + ] configs = [ ":module_context_config" ] @@ -210,7 +217,9 @@ ohos_unittest("application_context_for_task_dispacher_test") { ohos_unittest("context_deal_for_task_dispacher_test") { module_out_path = module_output_path - sources = [ "unittest/context_deal_for_task_dispacher_test.cpp" ] + sources = [ + "unittest/context_deal_for_task_dispacher_test.cpp", + ] configs = [ ":module_context_config" ] @@ -357,7 +366,9 @@ ohos_unittest("watchdog_test") { ":ability_start_setting_config", ] - sources = [ "unittest/watchdog_test.cpp" ] + sources = [ + "unittest/watchdog_test.cpp", + ] deps = [ "${aafwk_path}/frameworks/kits/appkit:appkit_native", diff --git a/frameworks/kits/test/BUILD.gn b/frameworks/kits/test/BUILD.gn index e1129fb3236..93358295e27 100644 --- a/frameworks/kits/test/BUILD.gn +++ b/frameworks/kits/test/BUILD.gn @@ -12,6 +12,7 @@ # limitations under the License. import("//build/test.gni") +import("//foundation/aafwk/standard/feature.gni") module_output_path = "ability_runtime/aafwk_L2" @@ -103,7 +104,6 @@ ohos_moduletest("ability_moduletest") { "//foundation/appexecfwk/standard/common:libappexecfwk_common", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", - "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//third_party/jsoncpp:jsoncpp", @@ -114,11 +114,15 @@ ohos_moduletest("ability_moduletest") { "bundle_framework:appexecfwk_core", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", - "multimodalinput_base:libmmi-client", "native_appdatamgr:native_appdatafwk", "native_appdatamgr:native_dataability", "native_appdatamgr:native_rdb", ] + + if (ability_runtime_graphics) { + deps += [ "//foundation/multimedia/image_standard/interfaces/innerkits:image_native" ] + external_deps += [ "multimodalinput_base:libmmi-client" ] + } } ohos_moduletest("ability_conetxt_test") { @@ -174,11 +178,14 @@ ohos_moduletest("ability_conetxt_test") { "bundle_framework:appexecfwk_core", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", - "multimodalinput_base:libmmi-client", "native_appdatamgr:native_appdatafwk", "native_appdatamgr:native_dataability", "native_appdatamgr:native_rdb", ] + + if (ability_runtime_graphics) { + external_deps += [ "multimodalinput_base:libmmi-client" ] + } } ohos_moduletest("data_ability_operation_moduletest") { @@ -236,7 +243,6 @@ ohos_moduletest("data_ability_operation_moduletest") { "//foundation/appexecfwk/standard/common:libappexecfwk_common", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", - "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//third_party/jsoncpp:jsoncpp", @@ -247,11 +253,15 @@ ohos_moduletest("data_ability_operation_moduletest") { "bundle_framework:appexecfwk_core", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", - "multimodalinput_base:libmmi-client", "native_appdatamgr:native_appdatafwk", "native_appdatamgr:native_dataability", "native_appdatamgr:native_rdb", ] + + if (ability_runtime_graphics) { + deps += [ "//foundation/multimedia/image_standard/interfaces/innerkits:image_native" ] + external_deps += [ "multimodalinput_base:libmmi-client" ] + } } ohos_moduletest("data_ability_helper_module_test") { @@ -267,7 +277,9 @@ ohos_moduletest("data_ability_helper_module_test") { "//foundation/communication/ipc/interfaces/innerkits/libdbinder/include", ] - sources = [ "//foundation/aafwk/standard/frameworks/kits/test/moduletest/cpp/abilitytest/data_ability_helper_module_test.cpp" ] + sources = [ + "//foundation/aafwk/standard/frameworks/kits/test/moduletest/cpp/abilitytest/data_ability_helper_module_test.cpp", + ] configs = [ ":module_private_config", @@ -291,11 +303,14 @@ ohos_moduletest("data_ability_helper_module_test") { external_deps = [ "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", - "multimodalinput_base:libmmi-client", "native_appdatamgr:native_appdatafwk", "native_appdatamgr:native_dataability", "native_appdatamgr:native_rdb", ] + + if (ability_runtime_graphics) { + external_deps += [ "multimodalinput_base:libmmi-client" ] + } } ################################################################################ diff --git a/frameworks/kits/wantagent/test/unittest/completed_dispatcher_test/BUILD.gn b/frameworks/kits/wantagent/test/unittest/completed_dispatcher_test/BUILD.gn index 35189a8811a..9245483a32f 100644 --- a/frameworks/kits/wantagent/test/unittest/completed_dispatcher_test/BUILD.gn +++ b/frameworks/kits/wantagent/test/unittest/completed_dispatcher_test/BUILD.gn @@ -14,6 +14,7 @@ import("//base/notification/ans_standard/notification.gni") import("//build/ohos.gni") import("//build/test.gni") +import("//foundation/aafwk/standard/feature.gni") module_output_path = "ans_standard/wantagent" @@ -21,7 +22,9 @@ ohos_unittest("completed_dispatcher_test") { module_out_path = module_output_path include_dirs = [ "//foundation/aafwk/standard/services/abilitymgr/include" ] - sources = [ "completed_dispatcher_test.cpp" ] + sources = [ + "completed_dispatcher_test.cpp", + ] configs = [ "//utils/native/base:utils_config" ] cflags = [] @@ -29,7 +32,6 @@ ohos_unittest("completed_dispatcher_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ - "${core_path}:ans_core", "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", "//foundation/aafwk/standard/frameworks/kits/wantagent:wantagent_innerkits", "//foundation/aafwk/standard/services/abilitymgr:abilityms", @@ -52,9 +54,15 @@ ohos_unittest("completed_dispatcher_test") { "ipc:ipc_core", "samgr_standard:samgr_proxy", ] + + if (ability_runtime_graphics) { + deps += [ "${core_path}:ans_core" ] + } } group("unittest") { testonly = true - deps = [ ":completed_dispatcher_test" ] + deps = [ + ":completed_dispatcher_test", + ] } diff --git a/frameworks/kits/wantagent/test/unittest/pending_want_test/BUILD.gn b/frameworks/kits/wantagent/test/unittest/pending_want_test/BUILD.gn index 0d5cef657a0..31b0c4cfd4b 100644 --- a/frameworks/kits/wantagent/test/unittest/pending_want_test/BUILD.gn +++ b/frameworks/kits/wantagent/test/unittest/pending_want_test/BUILD.gn @@ -14,6 +14,7 @@ import("//base/notification/ans_standard/notification.gni") import("//build/ohos.gni") import("//build/test.gni") +import("//foundation/aafwk/standard/feature.gni") module_output_path = "ans_standard/wantagent" @@ -28,7 +29,9 @@ ohos_unittest("pending_want_test") { "//utils/native/base/include", ] - sources = [ "pending_want_test.cpp" ] + sources = [ + "pending_want_test.cpp", + ] configs = [ "//utils/native/base:utils_config" ] cflags = [] @@ -36,7 +39,6 @@ ohos_unittest("pending_want_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ - "${core_path}:ans_core", "//foundation/aafwk/standard/frameworks/kits/appkit:app_context", "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", "//foundation/aafwk/standard/frameworks/kits/wantagent:wantagent_innerkits", @@ -60,9 +62,15 @@ ohos_unittest("pending_want_test") { "ipc:ipc_core", "samgr_standard:samgr_proxy", ] + + if (ability_runtime_graphics) { + deps += [ "${core_path}:ans_core" ] + } } group("unittest") { testonly = true - deps = [ ":pending_want_test" ] + deps = [ + ":pending_want_test", + ] } diff --git a/frameworks/kits/wantagent/test/unittest/trigger_Info_test/BUILD.gn b/frameworks/kits/wantagent/test/unittest/trigger_Info_test/BUILD.gn index 749920e3521..4cc46a484aa 100644 --- a/frameworks/kits/wantagent/test/unittest/trigger_Info_test/BUILD.gn +++ b/frameworks/kits/wantagent/test/unittest/trigger_Info_test/BUILD.gn @@ -14,6 +14,7 @@ import("//base/notification/ans_standard/notification.gni") import("//build/ohos.gni") import("//build/test.gni") +import("//foundation/aafwk/standard/feature.gni") module_output_path = "ans_standard/wantagent" @@ -21,7 +22,9 @@ ohos_unittest("trigger_Info_test") { module_out_path = module_output_path include_dirs = [ "//foundation/aafwk/standard/services/abilitymgr/include" ] - sources = [ "trigger_Info_test.cpp" ] + sources = [ + "trigger_Info_test.cpp", + ] configs = [ "//utils/native/base:utils_config" ] cflags = [] @@ -29,7 +32,6 @@ ohos_unittest("trigger_Info_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ - "${core_path}:ans_core", "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", "//foundation/aafwk/standard/frameworks/kits/wantagent:wantagent_innerkits", "//foundation/aafwk/standard/services/abilitymgr:abilityms", @@ -52,9 +54,15 @@ ohos_unittest("trigger_Info_test") { "ipc:ipc_core", "samgr_standard:samgr_proxy", ] + + if (ability_runtime_graphics) { + deps += [ "${core_path}:ans_core" ] + } } group("unittest") { testonly = true - deps = [ ":trigger_Info_test" ] + deps = [ + ":trigger_Info_test", + ] } diff --git a/frameworks/kits/wantagent/test/unittest/want_agent_helper_test/BUILD.gn b/frameworks/kits/wantagent/test/unittest/want_agent_helper_test/BUILD.gn index 8a621c37dd0..5f7af29378c 100644 --- a/frameworks/kits/wantagent/test/unittest/want_agent_helper_test/BUILD.gn +++ b/frameworks/kits/wantagent/test/unittest/want_agent_helper_test/BUILD.gn @@ -14,6 +14,7 @@ import("//base/notification/ans_standard/notification.gni") import("//build/ohos.gni") import("//build/test.gni") +import("//foundation/aafwk/standard/feature.gni") module_output_path = "ans_standard/wantagent" @@ -25,7 +26,9 @@ ohos_unittest("want_agent_helper_test") { "//foundation/aafwk/standard/services/abilitymgr/include", ] - sources = [ "want_agent_helper_test.cpp" ] + sources = [ + "want_agent_helper_test.cpp", + ] configs = [ "//utils/native/base:utils_config" ] cflags = [] @@ -33,7 +36,6 @@ ohos_unittest("want_agent_helper_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ - "${core_path}:ans_core", "//foundation/aafwk/standard/frameworks/kits/appkit:app_context", "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", "//foundation/aafwk/standard/frameworks/kits/wantagent:wantagent_innerkits", @@ -57,9 +59,15 @@ ohos_unittest("want_agent_helper_test") { "ipc:ipc_core", "samgr_standard:samgr_proxy", ] + + if (ability_runtime_graphics) { + deps += [ "${core_path}:ans_core" ] + } } group("unittest") { testonly = true - deps = [ ":want_agent_helper_test" ] + deps = [ + ":want_agent_helper_test", + ] } diff --git a/frameworks/kits/wantagent/test/unittest/want_agent_info_test/BUILD.gn b/frameworks/kits/wantagent/test/unittest/want_agent_info_test/BUILD.gn index 8c03276482c..b6ab992693a 100644 --- a/frameworks/kits/wantagent/test/unittest/want_agent_info_test/BUILD.gn +++ b/frameworks/kits/wantagent/test/unittest/want_agent_info_test/BUILD.gn @@ -14,6 +14,7 @@ import("//base/notification/ans_standard/notification.gni") import("//build/ohos.gni") import("//build/test.gni") +import("//foundation/aafwk/standard/feature.gni") module_output_path = "ans_standard/wantagent" @@ -21,7 +22,9 @@ ohos_unittest("want_agent_info_test") { module_out_path = module_output_path include_dirs = [ "//foundation/aafwk/standard/services/abilitymgr/include" ] - sources = [ "want_agent_info_test.cpp" ] + sources = [ + "want_agent_info_test.cpp", + ] configs = [ "//utils/native/base:utils_config" ] cflags = [] @@ -29,7 +32,6 @@ ohos_unittest("want_agent_info_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ - "${core_path}:ans_core", "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", "//foundation/aafwk/standard/frameworks/kits/wantagent:wantagent_innerkits", "//foundation/aafwk/standard/services/abilitymgr:abilityms", @@ -52,9 +54,15 @@ ohos_unittest("want_agent_info_test") { "ipc:ipc_core", "samgr_standard:samgr_proxy", ] + + if (ability_runtime_graphics) { + deps += [ "${core_path}:ans_core" ] + } } group("unittest") { testonly = true - deps = [ ":want_agent_info_test" ] + deps = [ + ":want_agent_info_test", + ] } diff --git a/frameworks/kits/wantagent/test/unittest/want_agent_test/BUILD.gn b/frameworks/kits/wantagent/test/unittest/want_agent_test/BUILD.gn index 954ad8bf63c..25ce25ad1c2 100644 --- a/frameworks/kits/wantagent/test/unittest/want_agent_test/BUILD.gn +++ b/frameworks/kits/wantagent/test/unittest/want_agent_test/BUILD.gn @@ -14,6 +14,7 @@ import("//base/notification/ans_standard/notification.gni") import("//build/ohos.gni") import("//build/test.gni") +import("//foundation/aafwk/standard/feature.gni") module_output_path = "ans_standard/wantagent" @@ -21,7 +22,9 @@ ohos_unittest("want_agent_test") { module_out_path = module_output_path include_dirs = [ "//foundation/aafwk/standard/services/abilitymgr/include" ] - sources = [ "want_agent_test.cpp" ] + sources = [ + "want_agent_test.cpp", + ] configs = [ "//utils/native/base:utils_config" ] cflags = [] @@ -29,7 +32,6 @@ ohos_unittest("want_agent_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ - "${core_path}:ans_core", "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", "//foundation/aafwk/standard/frameworks/kits/wantagent:wantagent_innerkits", "//foundation/aafwk/standard/services/abilitymgr:abilityms", @@ -52,9 +54,15 @@ ohos_unittest("want_agent_test") { "ipc:ipc_core", "samgr_standard:samgr_proxy", ] + + if (ability_runtime_graphics) { + deps += [ "${core_path}:ans_core" ] + } } group("unittest") { testonly = true - deps = [ ":want_agent_test" ] + deps = [ + ":want_agent_test", + ] } diff --git a/interfaces/innerkits/BUILD.gn b/interfaces/innerkits/BUILD.gn index a88fbedebaf..1859652b7e6 100644 --- a/interfaces/innerkits/BUILD.gn +++ b/interfaces/innerkits/BUILD.gn @@ -10,6 +10,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +import("//foundation/aafwk/standard/feature.gni") group("innerkits_target") { deps = [ @@ -23,7 +24,11 @@ group("innerkits_target") { } group("fms_innerkits_target") { - deps = [ "form_manager:form_manager" ] + if (ability_runtime_graphics) { + deps = [ + "form_manager:form_manager", + ] + } } group("base_innerkits_target") { diff --git a/interfaces/innerkits/ability_manager/BUILD.gn b/interfaces/innerkits/ability_manager/BUILD.gn index 95247b4b899..25cc57ff8b8 100644 --- a/interfaces/innerkits/ability_manager/BUILD.gn +++ b/interfaces/innerkits/ability_manager/BUILD.gn @@ -13,6 +13,7 @@ import("//build/ohos.gni") import("//foundation/aafwk/standard/aafwk.gni") +import("//foundation/aafwk/standard/feature.gni") config("ability_manager_public_config") { visibility = [ ":*" ] @@ -29,12 +30,16 @@ config("ability_manager_public_config") { "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core/include/bundlemgr", "//foundation/aafwk/standard/interfaces/innerkits/app_manager/include/appmgr", "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/include", - "//foundation/multimedia/image_standard/interfaces/innerkits/include", "//foundation/distributeddatamgr/appdatamgr/interfaces/innerkits/native_rdb/include", "//foundation/distributeddatamgr/appdatamgr/interfaces/innerkits/native_appdatafwk/include", "//foundation/distributeddatamgr/appdatamgr/interfaces/innerkits/native_dataability/include", "//foundation/aafwk/standard/interfaces/innerkits/dataobs_manager/include", ] + + if (ability_runtime_graphics) { + include_dirs += [ "//foundation/multimedia/image_standard/interfaces/innerkits/include" ] + } + cflags = [] if (target_cpu == "arm") { cflags += [ "-DBINDER_IPC_32BIT" ] @@ -47,7 +52,6 @@ ohos_shared_library("ability_manager") { "${services_path}/abilitymgr/src/ability_manager_client.cpp", "${services_path}/abilitymgr/src/ability_manager_proxy.cpp", "${services_path}/abilitymgr/src/ability_manager_stub.cpp", - "${services_path}/abilitymgr/src/ability_mission_info.cpp", "${services_path}/abilitymgr/src/ability_record_info.cpp", "${services_path}/abilitymgr/src/ability_running_info.cpp", "${services_path}/abilitymgr/src/ability_scheduler_proxy.cpp", @@ -55,23 +59,10 @@ ohos_shared_library("ability_manager") { "${services_path}/abilitymgr/src/ability_start_setting.cpp", "${services_path}/abilitymgr/src/caller_info.cpp", "${services_path}/abilitymgr/src/extension_running_info.cpp", - "${services_path}/abilitymgr/src/image_info.cpp", "${services_path}/abilitymgr/src/launch_param.cpp", "${services_path}/abilitymgr/src/lifecycle_state_info.cpp", - "${services_path}/abilitymgr/src/mission_description_info.cpp", - "${services_path}/abilitymgr/src/mission_info.cpp", - "${services_path}/abilitymgr/src/mission_listener_proxy.cpp", - "${services_path}/abilitymgr/src/mission_listener_stub.cpp", - "${services_path}/abilitymgr/src/mission_option.cpp", - "${services_path}/abilitymgr/src/mission_record_info.cpp", - "${services_path}/abilitymgr/src/mission_snapshot.cpp", - "${services_path}/abilitymgr/src/mission_stack_info.cpp", - "${services_path}/abilitymgr/src/remote_mission_listener_proxy.cpp", - "${services_path}/abilitymgr/src/remote_mission_listener_stub.cpp", "${services_path}/abilitymgr/src/sender_info.cpp", "${services_path}/abilitymgr/src/shared_memory.cpp", - "${services_path}/abilitymgr/src/stack_info.cpp", - "${services_path}/abilitymgr/src/stack_setting.cpp", "${services_path}/abilitymgr/src/start_options.cpp", "${services_path}/abilitymgr/src/stop_user_callback_proxy.cpp", "${services_path}/abilitymgr/src/stop_user_callback_stub.cpp", @@ -104,7 +95,6 @@ ohos_shared_library("ability_manager") { "//foundation/distributeddatamgr/appdatamgr/interfaces/innerkits/native_dataability:native_dataability", "//foundation/distributeddatamgr/appdatamgr/interfaces/innerkits/native_rdb:native_rdb", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", - "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utils", ] @@ -119,6 +109,26 @@ ohos_shared_library("ability_manager") { "native_appdatamgr:native_rdb", ] + if (ability_runtime_graphics) { + sources += [ + "${services_path}/abilitymgr/src/ability_mission_info.cpp", + "${services_path}/abilitymgr/src/image_info.cpp", + "${services_path}/abilitymgr/src/mission_description_info.cpp", + "${services_path}/abilitymgr/src/mission_info.cpp", + "${services_path}/abilitymgr/src/mission_listener_proxy.cpp", + "${services_path}/abilitymgr/src/mission_listener_stub.cpp", + "${services_path}/abilitymgr/src/mission_option.cpp", + "${services_path}/abilitymgr/src/mission_record_info.cpp", + "${services_path}/abilitymgr/src/mission_snapshot.cpp", + "${services_path}/abilitymgr/src/mission_stack_info.cpp", + "${services_path}/abilitymgr/src/remote_mission_listener_proxy.cpp", + "${services_path}/abilitymgr/src/remote_mission_listener_stub.cpp", + "${services_path}/abilitymgr/src/stack_info.cpp", + "${services_path}/abilitymgr/src/stack_setting.cpp", + ] + deps += [ "//foundation/multimedia/image_standard/interfaces/innerkits:image_native" ] + } + subsystem_name = "aafwk" part_name = "ability_runtime" } diff --git a/interfaces/innerkits/ability_manager/include/ability_scheduler_interface.h b/interfaces/innerkits/ability_manager/include/ability_scheduler_interface.h index d4cf354b664..7696ce30911 100644 --- a/interfaces/innerkits/ability_manager/include/ability_scheduler_interface.h +++ b/interfaces/innerkits/ability_manager/include/ability_scheduler_interface.h @@ -228,6 +228,7 @@ public: */ virtual bool ScheduleUnregisterObserver(const Uri &uri, const sptr &dataObserver) = 0; +#ifdef SUPPORT_GRAPHICS virtual void NotifyMultiWinModeChanged(int32_t winModeKey, bool flag) = 0; /** @@ -236,6 +237,7 @@ public: * @param flag true: Indicates this ability is top active ability */ virtual void NotifyTopActiveAbilityChanged(bool flag) = 0; +#endif /** * @brief Notifies the registered observers of a change to the data resource specified by Uri. diff --git a/interfaces/innerkits/ability_manager/include/mission_snapshot.h b/interfaces/innerkits/ability_manager/include/mission_snapshot.h index 997494127a0..5c6e52699a3 100644 --- a/interfaces/innerkits/ability_manager/include/mission_snapshot.h +++ b/interfaces/innerkits/ability_manager/include/mission_snapshot.h @@ -20,7 +20,9 @@ #include "image_info.h" #include "parcel.h" #include "element_name.h" +#ifdef SUPPORT_GRAPHICS #include "foundation/multimedia/image_standard/interfaces/innerkits/include/pixel_map.h" +#endif namespace OHOS { namespace AAFwk { @@ -39,8 +41,9 @@ struct MissionPixelMap : public Parcelable { struct MissionSnapshot : public Parcelable { AppExecFwk::ElementName topAbility; +#ifdef SUPPORT_GRAPHICS std::shared_ptr snapshot; - +#endif bool ReadFromParcel(Parcel &parcel); virtual bool Marshalling(Parcel &parcel) const override; static MissionSnapshot *Unmarshalling(Parcel &parcel); diff --git a/interfaces/innerkits/ability_manager/include/snapshot.h b/interfaces/innerkits/ability_manager/include/snapshot.h index 9236a4e8cb2..65a8f0ca300 100644 --- a/interfaces/innerkits/ability_manager/include/snapshot.h +++ b/interfaces/innerkits/ability_manager/include/snapshot.h @@ -19,9 +19,11 @@ #include namespace OHOS { +#ifdef SUPPORT_GRAPHICS namespace Media { class PixelMap; } +#endif namespace AAFwk { /** * @class Snapshot @@ -31,6 +33,7 @@ class Snapshot { public: Snapshot() = default; ~Snapshot() = default; +#ifdef SUPPORT_GRAPHICS const std::shared_ptr& GetPixelMap() const { return pixelMap_; @@ -41,6 +44,7 @@ public: } private: std::shared_ptr pixelMap_ = nullptr; +#endif }; /** diff --git a/interfaces/kits/napi/BUILD.gn b/interfaces/kits/napi/BUILD.gn index 890f6ac8d55..2e57e0569ba 100644 --- a/interfaces/kits/napi/BUILD.gn +++ b/interfaces/kits/napi/BUILD.gn @@ -12,6 +12,7 @@ # limitations under the License. import("//build/ohos.gni") +import("//foundation/aafwk/standard/feature.gni") group("napi_packages") { deps = [ @@ -35,7 +36,6 @@ group("napi_packages") { "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/datashare_ext_ability:datashareextensionability_napi", "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/datashare_ext_ability_context:datashareextensionabilitycontext_napi", "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/extensioncontext:extensioncontext_napi", - "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/featureAbility:featureability", "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/inner/napi_common:napi_common", "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/mission_manager:distributedmissionmanager", "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/mission_manager:missionmanager_napi", @@ -49,13 +49,19 @@ group("napi_packages") { "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/wantConstant:wantconstant", "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/wantagent:wantagent", ] + + if (ability_runtime_graphics) { + deps += [ "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/featureAbility:featureability" ] + } } group("form_napi_packages") { - deps = [ - "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/formManager:formmanager", - "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/form_binding_data:formbindingdata_napi", - "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/form_extension:formextension_napi", - "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/form_extension_context:formextensioncontext_napi", - ] + if (ability_runtime_graphics) { + deps = [ + "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/formManager:formmanager", + "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/form_binding_data:formbindingdata_napi", + "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/form_extension:formextension_napi", + "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/form_extension_context:formextensioncontext_napi", + ] + } } diff --git a/interfaces/kits/napi/aafwk/abilityManager/BUILD.gn b/interfaces/kits/napi/aafwk/abilityManager/BUILD.gn index 432e4380197..8a9fc94fb98 100644 --- a/interfaces/kits/napi/aafwk/abilityManager/BUILD.gn +++ b/interfaces/kits/napi/aafwk/abilityManager/BUILD.gn @@ -12,13 +12,13 @@ # limitations under the License. import("//build/ohos.gni") +import("//foundation/aafwk/standard/feature.gni") ohos_shared_library("abilitymanager") { include_dirs = [ "//foundation/ace/napi/interfaces/kits", "//third_party/node/src", "//foundation/aafwk/standard/services/common/include", - "//foundation/multimedia/image_standard/interfaces/kits/js/common/include/", "//utils/system/safwk/native/include", "./", ] @@ -43,8 +43,6 @@ ohos_shared_library("abilitymanager") { "//foundation/appexecfwk/standard/libs/libeventhandler:libeventhandler_target", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", - "//foundation/multimedia/image_standard/interfaces/innerkits:image", - "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", "//utils/native/base:utils", ] @@ -54,6 +52,14 @@ ohos_shared_library("abilitymanager") { "ipc:ipc_core", ] + if (ability_runtime_graphics) { + include_dirs += [ "//foundation/multimedia/image_standard/interfaces/kits/js/common/include/" ] + deps += [ + "//foundation/multimedia/image_standard/interfaces/innerkits:image", + "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", + ] + } + relative_install_dir = "module/app" subsystem_name = "aafwk" diff --git a/interfaces/kits/napi/aafwk/abilityManager/napi_ability_manager.cpp b/interfaces/kits/napi/aafwk/abilityManager/napi_ability_manager.cpp index 782927ff8fd..b8ae696661e 100644 --- a/interfaces/kits/napi/aafwk/abilityManager/napi_ability_manager.cpp +++ b/interfaces/kits/napi/aafwk/abilityManager/napi_ability_manager.cpp @@ -314,13 +314,17 @@ void GetMissionSnapshotInfoForResult(napi_env env, MissionSnapshot &recentMissio NAPI_CALL_RETURN_VOID(env, napi_set_named_property(env, objTopAbilityInfo, "abilityName", abilityName)); NAPI_CALL_RETURN_VOID(env, napi_set_named_property(env, result, "topAbility", objTopAbilityInfo)); +#ifdef SUPPORT_GRAPHICS if (recentMissionInfos.snapshot) { napi_value iconResult = nullptr; iconResult = Media::PixelMapNapi::CreatePixelMap(env, recentMissionInfos.snapshot); NAPI_CALL_RETURN_VOID(env, napi_set_named_property(env, result, "snapshot", iconResult)); } else { +#endif NAPI_CALL_RETURN_VOID(env, napi_set_named_property(env, result, "snapshot", NapiGetNull(env))); +#ifdef SUPPORT_GRAPHICS } +#endif } auto NAPI_QueryRecentAbilityMissionInfosAsyncExecuteCallback = [](napi_env env, void *data) { diff --git a/interfaces/kits/napi/aafwk/abilityManager/napi_ability_manager.h b/interfaces/kits/napi/aafwk/abilityManager/napi_ability_manager.h index 3f1a04ef08c..fb6d259d6ca 100644 --- a/interfaces/kits/napi/aafwk/abilityManager/napi_ability_manager.h +++ b/interfaces/kits/napi/aafwk/abilityManager/napi_ability_manager.h @@ -22,7 +22,9 @@ #include "napi/native_api.h" #include "napi/native_common.h" #include "napi/native_node_api.h" +#ifdef SUPPORT_GRAPHICS #include "pixel_map_napi.h" +#endif #include "ability_manager_client.h" #include "running_process_info.h" #include "system_memory_attr.h" diff --git a/interfaces/kits/napi/aafwk/app/app_manager/BUILD.gn b/interfaces/kits/napi/aafwk/app/app_manager/BUILD.gn index 71fbac60531..988bdc38a54 100644 --- a/interfaces/kits/napi/aafwk/app/app_manager/BUILD.gn +++ b/interfaces/kits/napi/aafwk/app/app_manager/BUILD.gn @@ -12,12 +12,16 @@ # limitations under the License. import("//build/ohos.gni") +import("//foundation/aafwk/standard/feature.gni") ohos_shared_library("appmanager_napi") { - include_dirs = [ - "//foundation/multimedia/image_standard/interfaces/innerkits/include", - "//foundation/appexecfwk/standard/kits/appkit/napi/app_manager", - ] + include_dirs = + [ "//foundation/multimedia/image_standard/interfaces/innerkits/include" ] + + if (ability_runtime_graphics) { + include_dirs += + [ "//foundation/appexecfwk/standard/kits/appkit/napi/app_manager" ] + } sources = [ "app_manager_module.cpp", diff --git a/interfaces/kits/napi/aafwk/inner/napi_common/napi_common_ability.cpp b/interfaces/kits/napi/aafwk/inner/napi_common/napi_common_ability.cpp index 8f5ce8b92ab..ea8d59a5e5b 100644 --- a/interfaces/kits/napi/aafwk/inner/napi_common/napi_common_ability.cpp +++ b/interfaces/kits/napi/aafwk/inner/napi_common/napi_common_ability.cpp @@ -3095,7 +3095,7 @@ void StartAbilityExecuteCB(napi_env env, void *data) asyncCallbackInfo->errCode = NAPI_ERR_ABILITY_TYPE_INVALID; return; } - +#ifdef SUPPORT_GRAPHICS // inherit split mode auto windowMode = asyncCallbackInfo->ability->GetCurrentWindowMode(); if (windowMode == AbilityWindowConfiguration::MULTI_WINDOW_DISPLAY_PRIMARY || @@ -3103,7 +3103,7 @@ void StartAbilityExecuteCB(napi_env env, void *data) asyncCallbackInfo->param.want.SetParam(Want::PARAM_RESV_WINDOW_MODE, windowMode); } HILOG_INFO("window mode is %{public}d", windowMode); - +#endif ErrCode ret = ERR_OK; if (asyncCallbackInfo->param.setting == nullptr) { HILOG_INFO("%{public}s param.setting == nullptr call StartAbility.", __func__); diff --git a/interfaces/kits/napi/aafwk/mission_manager/BUILD.gn b/interfaces/kits/napi/aafwk/mission_manager/BUILD.gn index 8b50ade1630..40419e5daa1 100644 --- a/interfaces/kits/napi/aafwk/mission_manager/BUILD.gn +++ b/interfaces/kits/napi/aafwk/mission_manager/BUILD.gn @@ -12,6 +12,7 @@ # limitations under the License. import("//build/ohos.gni") +import("//foundation/aafwk/standard/feature.gni") ohos_shared_library("missionmanager_napi") { include_dirs = [] @@ -26,10 +27,8 @@ ohos_shared_library("missionmanager_napi") { configs = [ "//foundation/aafwk/standard/services/common:common_config" ] include_dirs = [ - "//foundation/multimedia/image_standard/interfaces/innerkits/include", "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/inner/napi_common", "//base/global/resmgr_standard/interfaces/innerkits/include", - "//third_party/icu/icu4c/source/common", "//foundation/aafwk/standard/frameworks/kits/ability/native/include/continuation/kits", "//foundation/communication/ipc/ipc/native/src/napi/include", ] @@ -55,9 +54,16 @@ ohos_shared_library("missionmanager_napi") { "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "ipc_js:rpc", - "multimedia_image_standard:image", ] + if (ability_runtime_graphics) { + include_dirs += [ + "//foundation/multimedia/image_standard/interfaces/innerkits/include", + "//third_party/icu/icu4c/source/common", + ] + external_deps += [ "multimedia_image_standard:image" ] + } + relative_install_dir = "module/application" subsystem_name = "aafwk" diff --git a/interfaces/kits/napi/aafwk/mission_manager/mission_manager.cpp b/interfaces/kits/napi/aafwk/mission_manager/mission_manager.cpp index 424469f0693..16fb2ef352f 100644 --- a/interfaces/kits/napi/aafwk/mission_manager/mission_manager.cpp +++ b/interfaces/kits/napi/aafwk/mission_manager/mission_manager.cpp @@ -24,7 +24,9 @@ #include "js_runtime_utils.h" #include "mission_snapshot.h" #include "napi_common_start_options.h" +#ifdef SUPPORT_GRAPHICS #include "pixel_map_napi.h" +#endif #include "start_options.h" #include @@ -302,9 +304,11 @@ private: abilityObj->SetProperty( "abilityName", CreateJsValue(engine, missionSnapshot.topAbility.GetAbilityName())); object->SetProperty("ability", abilityValue); +#ifdef SUPPORT_GRAPHICS auto snapshotValue = reinterpret_cast(Media::PixelMapNapi::CreatePixelMap( reinterpret_cast(&engine), missionSnapshot.snapshot)); object->SetProperty("snapshot", snapshotValue); +#endif task.Resolve(engine, objValue); } else { task.Reject(engine, CreateJsError(engine, ret, "Get mission snapshot failed.")); diff --git a/services/BUILD.gn b/services/BUILD.gn index 5770614a362..c1bcbe1a107 100644 --- a/services/BUILD.gn +++ b/services/BUILD.gn @@ -10,6 +10,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +import("//foundation/aafwk/standard/feature.gni") group("services_target") { deps = [ @@ -22,7 +23,11 @@ group("services_target") { } group("fms_services_target") { - deps = [ "formmgr:fms_target" ] + if (ability_runtime_graphics) { + deps = [ + "formmgr:fms_target", + ] + } } group("unittest") { diff --git a/services/abilitymgr/BUILD.gn b/services/abilitymgr/BUILD.gn index e3a9f0375b1..9871fa1987f 100644 --- a/services/abilitymgr/BUILD.gn +++ b/services/abilitymgr/BUILD.gn @@ -14,6 +14,7 @@ import("//build/ohos.gni") import("//foundation/aafwk/standard/aafwk.gni") import("//foundation/aafwk/standard/services/abilitymgr/abilitymgr.gni") +import("//foundation/aafwk/standard/feature.gni") EVENT_DIR = "//base/notification/ces_standard/" group("abilityms_target") { @@ -26,7 +27,9 @@ group("abilityms_target") { group("unittest") { testonly = true - deps = [ "test:unittest" ] + deps = [ + "test:unittest", + ] } config("abilityms_config") { @@ -49,15 +52,11 @@ config("abilityms_config") { "//prebuilts/jdk/jdk8/linux-x86/include/linux", "//third_party/json/include", "//foundation/aafwk/standard/frameworks/kits/ability/native/include", - "//foundation/graphic/standard/interfaces/innerkits", - "//foundation/multimedia/image_standard/interfaces/innerkits/include", "//foundation/distributeddatamgr/appdatamgr/interfaces/innerkits/native_rdb/include", "//foundation/distributeddatamgr/appdatamgr/interfaces/innerkits/native_appdatafwk/include", "//foundation/distributeddatamgr/appdatamgr/interfaces/innerkits/native_dataability/include", "//foundation/aafwk/standard/interfaces/innerkits/dataobs_manager/include", "//foundation/aafwk/standard/tools/aa/include", - "//foundation/graphic/standard/interfaces/innerkits/wmservice", - "//base/global/i18n_standard/frameworks/intl/include", "//base/hiviewdfx/hiview/adapter/utility/include", "//base/account/os_account/frameworks/common/account_error/include", "//base/account/os_account/frameworks/common/database/include", @@ -66,6 +65,16 @@ config("abilityms_config") { "//base/hiviewdfx/hicollie/interfaces/native/innerkits/include", "//base/startup/syspara_lite/interfaces/innerkits/native/syspara/include", ] + + if (ability_runtime_graphics) { + include_dirs += [ + "//foundation/graphic/standard/interfaces/innerkits", + "//foundation/multimedia/image_standard/interfaces/innerkits/include", + "//foundation/graphic/standard/interfaces/innerkits/wmservice", + "//base/global/i18n_standard/frameworks/intl/include", + ] + } + cflags = [] if (target_cpu == "arm") { cflags += [ "-DBINDER_IPC_32BIT" ] @@ -84,22 +93,18 @@ ohos_shared_library("abilityms") { "${innerkits_path}/want:want", "${services_path}/common:perm_verification", "//base/account/os_account/frameworks/osaccount/native:os_account_innerkits", - "//base/global/i18n_standard/frameworks/intl:intl_util", "//base/hiviewdfx/hiview/adapter/utility:hiview_adapter_utility", "//base/startup/syspara_lite/interfaces/innerkits/native/syspara:syspara", "//foundation/aafwk/standard/frameworks/kits/ability/ability_runtime:ability_context_native", "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/ace/ace_engine/interfaces/innerkits/ui_service_manager:ui_service_mgr", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributeddatamgr/appdatamgr/interfaces/innerkits/native_dataability:native_dataability", "//foundation/distributeddatamgr/appdatamgr/interfaces/innerkits/native_rdb:native_rdb", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", - "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", - "//third_party/libpng:libpng", "//utils/native/base:utils", ] @@ -120,7 +125,17 @@ ohos_shared_library("abilityms") { "resmgr_standard:global_resmgr", ] - public_deps = [ "//foundation/graphic/standard:libwmservice" ] + if (ability_runtime_graphics) { + deps += [ + "//base/global/i18n_standard/frameworks/intl:intl_util", + "//foundation/ace/ace_engine/interfaces/innerkits/ui_service_manager:ui_service_mgr", + "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", + "//third_party/libpng:libpng", + ] + public_deps = [ + "//foundation/graphic/standard:libwmservice", + ] + } subsystem_name = "aafwk" part_name = "ability_runtime" @@ -133,5 +148,7 @@ ohos_prebuilt_etc("ams_service_config.json") { } group("ams_service_config") { - deps = [ ":ams_service_config.json" ] + deps = [ + ":ams_service_config.json", + ] } diff --git a/services/abilitymgr/abilitymgr.gni b/services/abilitymgr/abilitymgr.gni index 286ba3d4b74..2699ba87a1b 100644 --- a/services/abilitymgr/abilitymgr.gni +++ b/services/abilitymgr/abilitymgr.gni @@ -12,6 +12,7 @@ # limitations under the License. import("//foundation/aafwk/standard/aafwk.gni") +import("//foundation/aafwk/standard/feature.gni") abilityms_files = [ "${services_path}/abilitymgr/src/ability_connect_manager.cpp", @@ -23,7 +24,6 @@ abilityms_files = [ "${services_path}/abilitymgr/src/ability_record.cpp", "${services_path}/abilitymgr/src/ability_scheduler_stub.cpp", "${services_path}/abilitymgr/src/ability_scheduler_proxy.cpp", - "${services_path}/abilitymgr/src/ability_stack_manager.cpp", "${services_path}/abilitymgr/src/ability_token_stub.cpp", "${services_path}/abilitymgr/src/app_scheduler.cpp", "${services_path}/abilitymgr/src/connection_record.cpp", @@ -31,21 +31,11 @@ abilityms_files = [ "${services_path}/abilitymgr/src/data_ability_manager.cpp", "${services_path}/abilitymgr/src/data_ability_record.cpp", "${services_path}/abilitymgr/src/launch_param.cpp", - "${services_path}/abilitymgr/src/image_info.cpp", "${services_path}/abilitymgr/src/lifecycle_deal.cpp", - "${services_path}/abilitymgr/src/mission_record.cpp", - "${services_path}/abilitymgr/src/mission_stack.cpp", - "${services_path}/abilitymgr/src/power_storage.cpp", "${services_path}/abilitymgr/src/lifecycle_state_info.cpp", - "${services_path}/abilitymgr/src/stack_info.cpp", - "${services_path}/abilitymgr/src/mission_stack_info.cpp", "${services_path}/abilitymgr/src/ability_running_info.cpp", "${services_path}/abilitymgr/src/extension_running_info.cpp", - "${services_path}/abilitymgr/src/mission_record_info.cpp", "${services_path}/abilitymgr/src/ability_record_info.cpp", - "${services_path}/abilitymgr/src/ability_mission_info.cpp", - "${services_path}/abilitymgr/src/mission_description_info.cpp", - "${services_path}/abilitymgr/src/mission_snapshot.cpp", "${services_path}/abilitymgr/src/caller_info.cpp", "${services_path}/abilitymgr/src/sender_info.cpp", "${services_path}/abilitymgr/src/wants_info.cpp", @@ -58,32 +48,11 @@ abilityms_files = [ "${services_path}/abilitymgr/src/pending_want_key.cpp", "${services_path}/abilitymgr/src/pending_want_manager.cpp", "${services_path}/abilitymgr/src/pending_want_common_event.cpp", - "${services_path}/abilitymgr/src/lock_mission_container.cpp", - "${services_path}/abilitymgr/src/lock_screen_white_list.cpp", "${services_path}/abilitymgr/src/ability_start_setting.cpp", - "${services_path}/abilitymgr/src/mission_option.cpp", - "${services_path}/abilitymgr/src/stack_setting.cpp", "${services_path}/abilitymgr/src/shared_memory.cpp", - "${services_path}/abilitymgr/src/resume_mission_container.cpp", - "${services_path}/abilitymgr/src/screenshot_handler.cpp", - "${services_path}/abilitymgr/src/screenshot_response.cpp", "${services_path}/abilitymgr/src/ams_configuration_parameter.cpp", - "${services_path}/abilitymgr/src/mission_index_info.cpp", - "${services_path}/abilitymgr/src/lock_screen_event_subscriber.cpp", # new ability manager service here - "${services_path}/abilitymgr/src/inner_mission_info.cpp", - "${services_path}/abilitymgr/src/mission.cpp", - "${services_path}/abilitymgr/src/mission_data_storage.cpp", - "${services_path}/abilitymgr/src/mission_info.cpp", - "${services_path}/abilitymgr/src/mission_info_mgr.cpp", - "${services_path}/abilitymgr/src/mission_listener_controller.cpp", - "${services_path}/abilitymgr/src/mission_listener_proxy.cpp", - "${services_path}/abilitymgr/src/mission_listener_stub.cpp", - "${services_path}/abilitymgr/src/remote_mission_listener_proxy.cpp", - "${services_path}/abilitymgr/src/remote_mission_listener_stub.cpp", - "${services_path}/abilitymgr/src/mission_list_manager.cpp", - "${services_path}/abilitymgr/src/mission_list.cpp", "${services_path}/abilitymgr/src/task_data_persistence_mgr.cpp", "${services_path}/abilitymgr/src/start_options.cpp", "${services_path}/abilitymgr/src/stop_user_callback_proxy.cpp", @@ -95,3 +64,41 @@ abilityms_files = [ "${services_path}/abilitymgr/src/user_controller.cpp", "${services_path}/abilitymgr/src/user_event_handler.cpp", ] + +if (ability_runtime_graphics) { + abilityms_files += [ + "${services_path}/abilitymgr/src/ability_stack_manager.cpp", + "${services_path}/abilitymgr/src/image_info.cpp", + "${services_path}/abilitymgr/src/mission_stack.cpp", + "${services_path}/abilitymgr/src/power_storage.cpp", + "${services_path}/abilitymgr/src/stack_info.cpp", + "${services_path}/abilitymgr/src/mission_stack_info.cpp", + "${services_path}/abilitymgr/src/mission_record_info.cpp", + "${services_path}/abilitymgr/src/ability_mission_info.cpp", + "${services_path}/abilitymgr/src/mission_description_info.cpp", + "${services_path}/abilitymgr/src/mission_snapshot.cpp", + "${services_path}/abilitymgr/src/lock_mission_container.cpp", + "${services_path}/abilitymgr/src/lock_screen_white_list.cpp", + "${services_path}/abilitymgr/src/mission_option.cpp", + "${services_path}/abilitymgr/src/stack_setting.cpp", + "${services_path}/abilitymgr/src/resume_mission_container.cpp", + "${services_path}/abilitymgr/src/screenshot_handler.cpp", + "${services_path}/abilitymgr/src/screenshot_response.cpp", + "${services_path}/abilitymgr/src/mission_index_info.cpp", + "${services_path}/abilitymgr/src/lock_screen_event_subscriber.cpp", + + # new ability manager service here + "${services_path}/abilitymgr/src/inner_mission_info.cpp", + "${services_path}/abilitymgr/src/mission.cpp", + "${services_path}/abilitymgr/src/mission_data_storage.cpp", + "${services_path}/abilitymgr/src/mission_info.cpp", + "${services_path}/abilitymgr/src/mission_info_mgr.cpp", + "${services_path}/abilitymgr/src/mission_listener_controller.cpp", + "${services_path}/abilitymgr/src/mission_listener_proxy.cpp", + "${services_path}/abilitymgr/src/mission_listener_stub.cpp", + "${services_path}/abilitymgr/src/remote_mission_listener_proxy.cpp", + "${services_path}/abilitymgr/src/remote_mission_listener_stub.cpp", + "${services_path}/abilitymgr/src/mission_list_manager.cpp", + "${services_path}/abilitymgr/src/mission_list.cpp", + ] +} diff --git a/services/abilitymgr/include/ability_manager_service.h b/services/abilitymgr/include/ability_manager_service.h index ad01edad2e3..ffd715e1d69 100644 --- a/services/abilitymgr/include/ability_manager_service.h +++ b/services/abilitymgr/include/ability_manager_service.h @@ -1056,7 +1056,9 @@ private: void DumpStateInner(const std::string &args, std::vector &info); void DataDumpStateInner(const std::string &args, std::vector &info); void DumpFocusMapInner(const std::string &args, std::vector &info); +#ifdef SUPPORT_GRAPHICS void DumpWindowModeInner(const std::string &args, std::vector &info); +#endif void DumpMissionListInner(const std::string &args, std::vector &info); void DumpMissionInfosInner(const std::string &args, std::vector &info); void DumpFuncInit(); @@ -1092,7 +1094,9 @@ private: int32_t InitAbilityInfoFromExtension(AppExecFwk::ExtensionAbilityInfo &extensionInfo, AppExecFwk::AbilityInfo &abilityInfo); +#ifdef SUPPORT_GRAPHICS int32_t ShowPickerDialog(const Want& want, int32_t userId); +#endif // multi user void StartFreezingScreen(); diff --git a/services/abilitymgr/include/ability_record.h b/services/abilitymgr/include/ability_record.h index a6384c46dff..7a4ce73bc2c 100644 --- a/services/abilitymgr/include/ability_record.h +++ b/services/abilitymgr/include/ability_record.h @@ -26,7 +26,9 @@ #include "ability_info.h" #include "ability_start_setting.h" #include "ability_token_stub.h" +#ifdef SUPPORT_GRAPHICS #include "ability_window_configuration.h" +#endif #include "app_scheduler.h" #include "application_info.h" #include "ability_record_info.h" @@ -35,7 +37,9 @@ #include "lifecycle_deal.h" #include "lifecycle_state_info.h" #include "want.h" +#ifdef SUPPORT_GRAPHICS #include "window_info.h" +#endif #include "uri.h" namespace OHOS { @@ -371,12 +375,14 @@ public: */ bool IsReady() const; +#ifdef SUPPORT_GRAPHICS /** * check whether the ability 's window is attached. * * @return true : attached ,false: not attached */ bool IsWindowAttached() const; +#endif /** * check whether the ability is launcher. @@ -596,6 +602,7 @@ public: */ bool IsConnectListEmpty(); +#ifdef SUPPORT_GRAPHICS /** * add ability's window info to record. * @@ -613,6 +620,7 @@ public: * */ std::shared_ptr GetWindowInfo() const; +#endif /** * add caller record @@ -726,8 +734,10 @@ public: bool IsAbilityState(const AbilityState &state) const; bool IsActiveState() const; +#ifdef SUPPORT_GRAPHICS bool SupportMultWindow() const; void NotifyMultiWinModeChanged(const AbilityWindowConfiguration &winModeKey, bool flag); +#endif void SetInMovingState(bool isMoving); bool GetInMovingState() const; diff --git a/services/abilitymgr/include/ability_scheduler_proxy.h b/services/abilitymgr/include/ability_scheduler_proxy.h index 26e93b3e80d..2e7fddd2cfb 100644 --- a/services/abilitymgr/include/ability_scheduler_proxy.h +++ b/services/abilitymgr/include/ability_scheduler_proxy.h @@ -201,6 +201,7 @@ public: */ int BatchInsert(const Uri &uri, const std::vector &values) override; +#ifdef SUPPORT_GRAPHICS /** * @brief notify multi window mode changed. * @@ -208,6 +209,7 @@ public: * @param flag Indicates this ability has been enter this mode. */ void NotifyMultiWinModeChanged(int32_t winModeKey, bool flag) override; +#endif /** * @brief Registers an observer to DataObsMgr specified by the given Uri. @@ -229,12 +231,14 @@ public: */ bool ScheduleUnregisterObserver(const Uri &uri, const sptr &dataObserver) override; +#ifdef SUPPORT_GRAPHICS /** * @brief notify this ability is top active ability. * * @param flag true: Indicates this ability is top active ability */ void NotifyTopActiveAbilityChanged(bool flag) override; +#endif /** * @brief Notifies the registered observers of a change to the data resource specified by Uri. diff --git a/services/abilitymgr/include/ability_scheduler_stub.h b/services/abilitymgr/include/ability_scheduler_stub.h index ea3dc636cb0..7ae8644bf1e 100644 --- a/services/abilitymgr/include/ability_scheduler_stub.h +++ b/services/abilitymgr/include/ability_scheduler_stub.h @@ -61,8 +61,10 @@ private: int DenormalizeUriInner(MessageParcel &data, MessageParcel &reply); int UpdateConfigurationInner(MessageParcel &data, MessageParcel &reply); int ExecuteBatchInner(MessageParcel &data, MessageParcel &reply); +#ifdef SUPPORT_GRAPHICS int MutiWinModeChangedInner(MessageParcel &data, MessageParcel &reply); int TopActiveAbilityChangedInner(MessageParcel &data, MessageParcel &reply); +#endif int NotifyContinuationResultInner(MessageParcel &data, MessageParcel &reply); int DumpAbilityInfoInner(MessageParcel& data, MessageParcel& reply); int CallRequestInner(MessageParcel &data, MessageParcel &reply); diff --git a/services/abilitymgr/src/ability_manager_client.cpp b/services/abilitymgr/src/ability_manager_client.cpp index 2701d3fe6e2..486f96063e7 100644 --- a/services/abilitymgr/src/ability_manager_client.cpp +++ b/services/abilitymgr/src/ability_manager_client.cpp @@ -100,12 +100,14 @@ ErrCode AbilityManagerClient::ScheduleCommandAbilityDone(const sptrScheduleCommandAbilityDone(token); } +#ifdef SUPPORT_GRAPHICS void AbilityManagerClient::AddWindowInfo(const sptr &token, int32_t windowToken) { CHECK_REMOTE_OBJECT(remoteObject_); sptr abms = iface_cast(remoteObject_); abms->AddWindowInfo(token, windowToken); } +#endif ErrCode AbilityManagerClient::StartAbility(const Want &want, int requestCode, int32_t userId) { @@ -250,12 +252,14 @@ ErrCode AbilityManagerClient::Connect() return ERR_OK; } +#ifdef SUPPORT_GRAPHICS ErrCode AbilityManagerClient::GetAllStackInfo(StackInfo &stackInfo) { CHECK_REMOTE_OBJECT_AND_RETURN(remoteObject_, ABILITY_SERVICE_NOT_CONNECTED); sptr abms = iface_cast(remoteObject_); return abms->GetAllStackInfo(stackInfo); } +#endif ErrCode AbilityManagerClient::StopServiceAbility(const Want &want) { @@ -264,6 +268,7 @@ ErrCode AbilityManagerClient::StopServiceAbility(const Want &want) return abms->StopServiceAbility(want); } +#ifdef SUPPORT_GRAPHICS ErrCode AbilityManagerClient::GetRecentMissions( const int32_t numMax, const int32_t flags, std::vector &recentList) { @@ -345,6 +350,7 @@ ErrCode AbilityManagerClient::RemoveStack(int id) sptr abms = iface_cast(remoteObject_); return abms->RemoveStack(id); } +#endif ErrCode AbilityManagerClient::KillProcess(const std::string &bundleName) { @@ -369,6 +375,7 @@ ErrCode AbilityManagerClient::ClearUpApplicationData(const std::string &bundleNa return abms->ClearUpApplicationData(bundleName); } +#ifdef SUPPORT_GRAPHICS ErrCode AbilityManagerClient::IsFirstInMission(const sptr &token) { if (token == nullptr) { @@ -382,6 +389,7 @@ ErrCode AbilityManagerClient::IsFirstInMission(const sptr &token) } return ERR_OK; } +#endif ErrCode AbilityManagerClient::CompelVerifyPermission( const std::string &permission, int pid, int uid, std::string &message) @@ -391,6 +399,7 @@ ErrCode AbilityManagerClient::CompelVerifyPermission( return abms->CompelVerifyPermission(permission, pid, uid, message); } +#ifdef SUPPORT_GRAPHICS ErrCode AbilityManagerClient::MoveMissionToFloatingStack(const MissionOption &missionOption) { CHECK_REMOTE_OBJECT_AND_RETURN(remoteObject_, ABILITY_SERVICE_NOT_CONNECTED); @@ -419,6 +428,7 @@ ErrCode AbilityManagerClient::MaximizeMultiWindow(int missionId) sptr abms = iface_cast(remoteObject_); return abms->MaximizeMultiWindow(missionId); } +#endif ErrCode AbilityManagerClient::ChangeFocusAbility( const sptr &lostFocusToken, const sptr &getFocusToken) @@ -428,6 +438,7 @@ ErrCode AbilityManagerClient::ChangeFocusAbility( return abms->ChangeFocusAbility(lostFocusToken, getFocusToken); } +#ifdef SUPPORT_GRAPHICS ErrCode AbilityManagerClient::GetFloatingMissions(std::vector &list) { CHECK_REMOTE_OBJECT_AND_RETURN(remoteObject_, ABILITY_SERVICE_NOT_CONNECTED); @@ -491,6 +502,7 @@ ErrCode AbilityManagerClient::GetMissionLockModeState() sptr abms = iface_cast(remoteObject_); return abms->GetMissionLockModeState(); } +#endif ErrCode AbilityManagerClient::UpdateConfiguration(const AppExecFwk::Configuration &config) { @@ -643,12 +655,14 @@ ErrCode AbilityManagerClient::GetWantSenderInfo(const sptr &target, return abms->GetWantSenderInfo(target, info); } +#ifdef SUPPORT_GRAPHICS ErrCode AbilityManagerClient::SetShowOnLockScreen(bool isAllow) { CHECK_REMOTE_OBJECT_AND_RETURN(remoteObject_, ABILITY_SERVICE_NOT_CONNECTED); sptr abms = iface_cast(remoteObject_); return abms->SetShowOnLockScreen(isAllow); } +#endif /** * Get system memory information. @@ -662,6 +676,7 @@ void AbilityManagerClient::GetSystemMemoryAttr(AppExecFwk::SystemMemoryAttr &mem return; } +#ifdef SUPPORT_GRAPHICS ErrCode AbilityManagerClient::ContinueMission(const std::string &srcDeviceId, const std::string &dstDeviceId, int32_t missionId, const sptr &callback, AAFwk::WantParams &wantParams) { @@ -675,6 +690,7 @@ ErrCode AbilityManagerClient::ContinueMission(const std::string &srcDeviceId, co int result = abms->ContinueMission(srcDeviceId, dstDeviceId, missionId, callback, wantParams); return result; } +#endif ErrCode AbilityManagerClient::StartContinuation(const Want &want, const sptr &abilityToken, int32_t status) @@ -695,6 +711,7 @@ void AbilityManagerClient::NotifyCompleteContinuation(const std::string &deviceI abms->NotifyCompleteContinuation(deviceId, sessionId, isSuccess); } +#ifdef SUPPORT_GRAPHICS ErrCode AbilityManagerClient::LockMissionForCleanup(int32_t missionId) { CHECK_REMOTE_OBJECT_AND_RETURN(remoteObject_, ABILITY_SERVICE_NOT_CONNECTED); @@ -794,6 +811,7 @@ ErrCode AbilityManagerClient::MoveMissionToFront(int32_t missionId, const StartO sptr abms = iface_cast(remoteObject_); return abms->MoveMissionToFront(missionId, startOptions); } +#endif ErrCode AbilityManagerClient::StartAbilityByCall( const Want &want, const sptr &connect, const sptr &callToken) @@ -833,6 +851,7 @@ ErrCode AbilityManagerClient::GetProcessRunningInfos(std::vectorGetProcessRunningInfos(info); } +#ifdef SUPPORT_GRAPHICS /** * Start synchronizing remote device mission * @param devId, deviceId. @@ -857,6 +876,8 @@ ErrCode AbilityManagerClient::StopSyncRemoteMissions(const std::string &devId) auto abms = iface_cast(remoteObject_); return abms->StopSyncRemoteMissions(devId); } +#endif + ErrCode AbilityManagerClient::StartUser(int accountId) { CHECK_REMOTE_OBJECT_AND_RETURN(remoteObject_, ABILITY_SERVICE_NOT_CONNECTED); @@ -870,6 +891,7 @@ ErrCode AbilityManagerClient::StopUser(int accountId, const sptrStopUser(accountId, callback); } +#ifdef SUPPORT_GRAPHICS ErrCode AbilityManagerClient::RegisterSnapshotHandler(const sptr& handler) { CHECK_REMOTE_OBJECT_AND_RETURN(remoteObject_, ABILITY_SERVICE_NOT_CONNECTED); @@ -884,6 +906,7 @@ ErrCode AbilityManagerClient::GetMissionSnapshot(const std::string& deviceId, in auto abms = iface_cast(remoteObject_); return abms->GetMissionSnapshot(deviceId, missionId, snapshot); } +#endif ErrCode AbilityManagerClient::StartUserTest(const Want &want, const sptr &observer) { @@ -909,6 +932,7 @@ ErrCode AbilityManagerClient::GetCurrentTopAbility(sptr &token) return abms->GetCurrentTopAbility(token); } +#ifdef SUPPORT_GRAPHICS ErrCode AbilityManagerClient::DelegatorDoAbilityForeground(const sptr &token) { CHECK_REMOTE_OBJECT_AND_RETURN(remoteObject_, ABILITY_SERVICE_NOT_CONNECTED); @@ -947,6 +971,7 @@ ErrCode AbilityManagerClient::DoAbilityBackground(const sptr &tok sptr abms = iface_cast(remoteObject_); return abms->DoAbilityBackground(token, flag); } +#endif ErrCode AbilityManagerClient::SetAbilityController(const sptr &abilityController, bool imAStabilityTest) diff --git a/services/abilitymgr/src/ability_manager_service.cpp b/services/abilitymgr/src/ability_manager_service.cpp index 21a005c68f7..efa7cbcfe25 100644 --- a/services/abilitymgr/src/ability_manager_service.cpp +++ b/services/abilitymgr/src/ability_manager_service.cpp @@ -38,9 +38,13 @@ #include "ipc_skeleton.h" #include "iservice_registry.h" #include "itest_observer.h" +#ifdef SUPPORT_GRAPHICS +#include "png.h" +#include "ui_service_mgr_client.h" #include "locale_config.h" #include "lock_screen_white_list.h" #include "mission_info_mgr.h" +#endif #include "permission_constants.h" #include "permission_verification.h" #include "sa_mgr_client.h" @@ -48,8 +52,6 @@ #include "string_ex.h" #include "system_ability_definition.h" #include "os_account_manager.h" -#include "png.h" -#include "ui_service_mgr_client.h" #include "uri_permission_manager_client.h" #include "xcollie/watchdog.h" #include "parameter.h" @@ -193,11 +195,11 @@ bool AbilityManagerService::Init() HILOG_INFO("ams config parse"); } useNewMission_ = amsConfigResolver_->IsUseNewMission(); - +#ifdef SUPPORT_GRAPHICS SetStackManager(userId, true); InitMissionListManager(userId, true); - +#endif SwitchManagers(U0_USER_ID, false); int amsTimeOut = amsConfigResolver_->GetAMSTimeOutTime(); if (HiviewDFX::Watchdog::GetInstance().AddThread("AMSWatchdog", handler_, amsTimeOut) != 0) { @@ -337,7 +339,7 @@ int AbilityManagerService::StartAbilityInner(const Want &want, const sptrStartAbility(abilityRequest); } +#endif } int AbilityManagerService::StartAbility(const Want &want, const AbilityStartSetting &abilityStartSetting, @@ -416,15 +419,16 @@ int AbilityManagerService::StartAbility(const Want &want, const AbilityStartSett return result; } } - +#ifdef SUPPORT_GRAPHICS if (abilityInfo.type != AppExecFwk::AbilityType::PAGE) { HILOG_ERROR("Only support for page type ability."); return ERR_INVALID_VALUE; } - +#endif if (!IsAbilityControllerStart(want, abilityInfo.bundleName)) { return ERR_WOULD_BLOCK; } +#ifdef SUPPORT_GRAPHICS if (useNewMission_) { auto missionListManager = GetListManagerByUserId(validUserId); if (missionListManager == nullptr) { @@ -440,6 +444,7 @@ int AbilityManagerService::StartAbility(const Want &want, const AbilityStartSett } return stackManager->StartAbility(abilityRequest); } +#endif } int AbilityManagerService::StartAbility(const Want &want, const StartOptions &startOptions, @@ -505,6 +510,7 @@ int AbilityManagerService::StartAbility(const Want &want, const StartOptions &st return ERR_WOULD_BLOCK; } GrantUriPermission(want, validUserId); +#ifdef SUPPORT_GRAPHICS abilityRequest.want.SetParam(Want::PARAM_RESV_DISPLAY_ID, startOptions.GetDisplayID()); abilityRequest.want.SetParam(Want::PARAM_RESV_WINDOW_MODE, startOptions.GetWindowMode()); if (useNewMission_) { @@ -522,6 +528,7 @@ int AbilityManagerService::StartAbility(const Want &want, const StartOptions &st } return stackManager->StartAbility(abilityRequest); } +#endif } void AbilityManagerService::GrantUriPermission(const Want &want, int32_t validUserId) @@ -646,6 +653,7 @@ int AbilityManagerService::TerminateAbilityWithFlag(const sptr &t return ERR_WOULD_BLOCK; } +#ifdef SUPPORT_GRAPHICS if (useNewMission_) { auto missionListManager = GetListManagerByUserId(userId); if (missionListManager == nullptr) { @@ -661,6 +669,7 @@ int AbilityManagerService::TerminateAbilityWithFlag(const sptr &t } return stackManager->TerminateAbility(token, resultCode, resultWant); } +#endif } int AbilityManagerService::StartRemoteAbility(const Want &want, int requestCode) @@ -761,15 +770,18 @@ int AbilityManagerService::TerminateAbilityByCaller(const sptr &c auto abilityRecord = Token::GetAbilityRecordByToken(callerToken); CHECK_POINTER_AND_RETURN(abilityRecord, ERR_INVALID_VALUE); - +#ifdef SUPPORT_GRAPHICS if (IsSystemUiApp(abilityRecord->GetAbilityInfo())) { HILOG_ERROR("System ui not allow terminate."); return ERR_INVALID_VALUE; } +#endif auto userId = abilityRecord->GetApplicationInfo().uid / BASE_USER_RANGE; auto type = abilityRecord->GetAbilityInfo().type; +#ifdef SUPPORT_GRAPHICS auto stackManager = GetStackManagerByUserId(userId); +#endif auto connectManager = GetConnectManagerByUserId(userId); switch (type) { case AppExecFwk::AbilityType::SERVICE: @@ -792,6 +804,7 @@ int AbilityManagerService::TerminateAbilityByCaller(const sptr &c } return result; } +#ifdef SUPPORT_GRAPHICS case AppExecFwk::AbilityType::PAGE: { if (!IsAbilityControllerForeground(abilityRecord->GetAbilityInfo().bundleName)) { return ERR_WOULD_BLOCK; @@ -810,6 +823,7 @@ int AbilityManagerService::TerminateAbilityByCaller(const sptr &c } return result; } +#endif default: return ERR_INVALID_VALUE; } @@ -840,7 +854,7 @@ int AbilityManagerService::MinimizeAbility(const sptr &token, boo if (!IsAbilityControllerForeground(abilityRecord->GetAbilityInfo().bundleName)) { return ERR_WOULD_BLOCK; } - +#ifdef SUPPORT_GRAPHICS if (useNewMission_) { auto missionListManager = GetListManagerByUserId(userId); if (!missionListManager) { @@ -856,8 +870,10 @@ int AbilityManagerService::MinimizeAbility(const sptr &token, boo } return stackManager->MinimizeAbility(token); } +#endif } +#ifdef SUPPORT_GRAPHICS int AbilityManagerService::GetRecentMissions( const int32_t numMax, const int32_t flags, std::vector &recentList) { @@ -908,6 +924,7 @@ int AbilityManagerService::GetMissionLockModeState() CHECK_POINTER_AND_RETURN(currentStackManager_, ERR_INVALID_VALUE); return currentStackManager_->GetMissionLockModeState(); } +#endif int AbilityManagerService::UpdateConfiguration(const AppExecFwk::Configuration &config) { @@ -915,6 +932,7 @@ int AbilityManagerService::UpdateConfiguration(const AppExecFwk::Configuration & return DelayedSingleton::GetInstance()->UpdateConfiguration(config); } +#ifdef SUPPORT_GRAPHICS int AbilityManagerService::MoveMissionToTop(int32_t missionId) { HILOG_INFO("Move mission to top."); @@ -966,6 +984,7 @@ int AbilityManagerService::RemoveStack(int id) } return currentStackManager_->RemoveStack(id); } +#endif int AbilityManagerService::ConnectAbility( const Want &want, const sptr &connect, const sptr &callerToken, int32_t userId) @@ -1086,6 +1105,7 @@ int AbilityManagerService::DisconnectRemoteAbility(const sptr &co return dmsClient.DisconnectRemoteAbility(connect); } +#ifdef SUPPORT_GRAPHICS int AbilityManagerService::ContinueMission(const std::string &srcDeviceId, const std::string &dstDeviceId, int32_t missionId, const sptr &callBack, AAFwk::WantParams &wantParams) { @@ -1098,6 +1118,7 @@ int AbilityManagerService::ContinueMission(const std::string &srcDeviceId, const DistributedClient dmsClient; return dmsClient.ContinueMission(srcDeviceId, dstDeviceId, missionId, callBack, wantParams); } +#endif int AbilityManagerService::ContinueAbility(const std::string &deviceId, int32_t missionId) { @@ -1161,6 +1182,7 @@ int AbilityManagerService::NotifyContinuationResult(int32_t missionId, int32_t r return ERR_OK; } +#ifdef SUPPORT_GRAPHICS int AbilityManagerService::StartSyncRemoteMissions(const std::string& devId, bool fixConflict, int64_t tag) { if (VerifyMissionPermission() == CHECK_PERMISSION_FAILED) { @@ -1214,6 +1236,7 @@ int AbilityManagerService::UnRegisterMissionListener(const std::string &deviceId DistributedClient dmsClient; return dmsClient.UnRegisterMissionListener(Str8ToStr16(deviceId), listener->AsObject()); } +#endif void AbilityManagerService::RemoveAllServiceRecord() { @@ -1378,6 +1401,7 @@ int AbilityManagerService::GetPendingRequestWant(const sptr &target return pendingWantManager_->GetPendingRequestWant(target, want); } +#ifdef SUPPORT_GRAPHICS int AbilityManagerService::SetShowOnLockScreen(bool isAllow) { HILOG_INFO("SetShowOnLockScreen"); @@ -1562,6 +1586,7 @@ int AbilityManagerService::MoveMissionToFront(int32_t missionId, const StartOpti auto options = std::make_shared(startOptions); return currentMissionListManager_->MoveMissionToFront(missionId, options); } +#endif std::shared_ptr AbilityManagerService::GetServiceRecordByElementName(const std::string &element) { @@ -1714,6 +1739,7 @@ int AbilityManagerService::AttachAbilityThread( } returnCode = dataAbilityManager->AttachAbilityThread(scheduler, token); } else { +#ifdef SUPPORT_GRAPHICS if (useNewMission_) { auto missionListManager = GetListManagerByUserId(userId); if (!missionListManager) { @@ -1729,6 +1755,7 @@ int AbilityManagerService::AttachAbilityThread( } returnCode = stackManager->AttachAbilityThread(scheduler, token); } +#endif } return returnCode; } @@ -1736,24 +1763,30 @@ int AbilityManagerService::AttachAbilityThread( void AbilityManagerService::DumpFuncInit() { dumpFuncMap_[KEY_DUMP_ALL] = &AbilityManagerService::DumpInner; +#ifdef SUPPORT_GRAPHICS dumpFuncMap_[KEY_DUMP_STACK_LIST] = &AbilityManagerService::DumpStackListInner; dumpFuncMap_[KEY_DUMP_STACK] = &AbilityManagerService::DumpStackInner; +#endif dumpFuncMap_[KEY_DUMP_MISSION] = &AbilityManagerService::DumpMissionInner; dumpFuncMap_[KEY_DUMP_TOP_ABILITY] = &AbilityManagerService::DumpTopAbilityInner; dumpFuncMap_[KEY_DUMP_WAIT_QUEUE] = &AbilityManagerService::DumpWaittingAbilityQueueInner; dumpFuncMap_[KEY_DUMP_SERVICE] = &AbilityManagerService::DumpStateInner; dumpFuncMap_[KEY_DUMP_DATA] = &AbilityManagerService::DataDumpStateInner; dumpFuncMap_[KEY_DUMP_FOCUS_ABILITY] = &AbilityManagerService::DumpFocusMapInner; +#ifdef SUPPORT_GRAPHICS dumpFuncMap_[KEY_DUMP_WINDOW_MODE] = &AbilityManagerService::DumpWindowModeInner; dumpFuncMap_[KEY_DUMP_MISSION_LIST] = &AbilityManagerService::DumpMissionListInner; dumpFuncMap_[KEY_DUMP_MISSION_INFOS] = &AbilityManagerService::DumpMissionInfosInner; +#endif } void AbilityManagerService::DumpSysFuncInit() { dumpsysFuncMap_[KEY_DUMPSYS_ALL] = &AbilityManagerService::DumpSysInner; +#ifdef SUPPORT_GRAPHICS dumpsysFuncMap_[KEY_DUMPSYS_MISSION_LIST] = &AbilityManagerService::DumpSysMissionListInner; dumpsysFuncMap_[KEY_DUMPSYS_ABILITY] = &AbilityManagerService::DumpSysAbilityInner; +#endif dumpsysFuncMap_[KEY_DUMPSYS_SERVICE] = &AbilityManagerService::DumpSysStateInner; dumpsysFuncMap_[KEY_DUMPSYS_PENDING] = &AbilityManagerService::DumpSysPendingInner; dumpsysFuncMap_[KEY_DUMPSYS_PROCESS] = &AbilityManagerService::DumpSysProcess; @@ -1774,6 +1807,7 @@ void AbilityManagerService::DumpSysInner( DumpSysProcess(args, info, isClient, isUserID, userId); } +#ifdef SUPPORT_GRAPHICS void AbilityManagerService::DumpSysMissionListInner( const std::string &args, std::vector &info, bool isClient, bool isUserID, int userId) { @@ -1805,6 +1839,7 @@ void AbilityManagerService::DumpSysMissionListInner( info.emplace_back("error: invalid argument, please see 'ability dumpsys -h'."); } } + void AbilityManagerService::DumpSysAbilityInner( const std::string &args, std::vector &info, bool isClient, bool isUserID, int userId) { @@ -1835,6 +1870,7 @@ void AbilityManagerService::DumpSysAbilityInner( info.emplace_back("error: invalid argument, please see 'ability dumpsys -h'."); } } +#endif void AbilityManagerService::DumpSysStateInner( const std::string& args, std::vector& info, bool isClient, bool isUserID, int userId) @@ -1990,6 +2026,7 @@ void AbilityManagerService::DumpInner(const std::string &args, std::vector &info) { currentStackManager_->DumpStackList(info); @@ -2054,6 +2091,7 @@ void AbilityManagerService::DumpMissionInner(const std::string &args, std::vecto currentStackManager_->DumpMission(missionId, info); } } +#endif void AbilityManagerService::DumpTopAbilityInner(const std::string &args, std::vector &info) { @@ -2198,6 +2236,7 @@ int AbilityManagerService::AbilityTransitionDone(const sptr &toke } return dataAbilityManager->AbilityTransitionDone(token, state); } +#ifdef SUPPORT_GRAPHICS if (useNewMission_) { auto missionListManager = GetListManagerByUserId(userId); if (!missionListManager) { @@ -2213,6 +2252,7 @@ int AbilityManagerService::AbilityTransitionDone(const sptr &toke } return stackManager->AbilityTransitionDone(token, state, saveData); } +#endif } int AbilityManagerService::ScheduleConnectAbilityDone( @@ -2291,6 +2331,7 @@ int AbilityManagerService::ScheduleCommandAbilityDone(const sptr return connectManager->ScheduleCommandAbilityDoneLocked(token); } +#ifdef SUPPORT_GRAPHICS void AbilityManagerService::AddWindowInfo(const sptr &token, int32_t windowToken) { HILOG_DEBUG("Add window id."); @@ -2306,6 +2347,7 @@ void AbilityManagerService::AddWindowInfo(const sptr &token, int3 } stackManager->AddWindowInfo(token, windowToken); } +#endif void AbilityManagerService::OnAbilityRequestDone(const sptr &token, const int32_t state) { @@ -2338,6 +2380,7 @@ void AbilityManagerService::OnAbilityRequestDone(const sptr &toke break; } default: { +#ifdef SUPPORT_GRAPHICS if (useNewMission_) { auto missionListManager = GetListManagerByUserId(userId); if (!missionListManager) { @@ -2353,6 +2396,7 @@ void AbilityManagerService::OnAbilityRequestDone(const sptr &toke } stackManager->OnAbilityRequestDone(token, state); } +#endif break; } } @@ -2362,11 +2406,13 @@ void AbilityManagerService::OnAppStateChanged(const AppInfo &info) { HILOG_INFO("On app state changed."); connectManager_->OnAppStateChanged(info); +#ifdef SUPPORT_GRAPHICS if (useNewMission_) { currentMissionListManager_->OnAppStateChanged(info); } else { currentStackManager_->OnAppStateChanged(info); } +#endif dataAbilityManager_->OnAppStateChanged(info); } @@ -2375,6 +2421,7 @@ std::shared_ptr AbilityManagerService::GetEventHandler() return handler_; } +#ifdef SUPPORT_GRAPHICS void AbilityManagerService::SetStackManager(int userId, bool switchUser) { auto iterator = stackManagers_.find(userId); @@ -2414,6 +2461,7 @@ std::shared_ptr AbilityManagerService::GetStackManager() { return currentStackManager_; } +#endif void AbilityManagerService::DumpWaittingAbilityQueue(std::string &result) { @@ -2553,10 +2601,11 @@ int AbilityManagerService::GenerateAbilityRequest( auto bms = GetBundleManager(); CHECK_POINTER_AND_RETURN(bms, GET_ABILITY_SERVICE_FAILED); - +#ifdef SUPPORT_GRAPHICS if (want.GetAction().compare(ACTION_CHOOSE) == 0) { return ShowPickerDialog(want, userId); } +#endif auto abilityInfoFlag = (AppExecFwk::AbilityInfoFlag::GET_ABILITY_INFO_WITH_APPLICATION | AppExecFwk::AbilityInfoFlag::GET_ABILITY_INFO_WITH_PERMISSION | AppExecFwk::AbilityInfoFlag::GET_ABILITY_INFO_WITH_METADATA); @@ -2602,6 +2651,7 @@ int AbilityManagerService::GenerateAbilityRequest( return ERR_OK; } +#ifdef SUPPORT_GRAPHICS int AbilityManagerService::GetAllStackInfo(StackInfo &stackInfo) { HILOG_DEBUG("Get all stack info."); @@ -2609,6 +2659,7 @@ int AbilityManagerService::GetAllStackInfo(StackInfo &stackInfo) currentStackManager_->GetAllStackInfo(stackInfo); return ERR_OK; } +#endif int AbilityManagerService::TerminateAbilityResult(const sptr &token, int startId) { @@ -2723,10 +2774,12 @@ void AbilityManagerService::GetMaxRestartNum(int &max) } } +#ifdef SUPPORT_GRAPHICS bool AbilityManagerService::IsUseNewMission() { return useNewMission_; } +#endif int AbilityManagerService::KillProcess(const std::string &bundleName) { @@ -3062,6 +3115,7 @@ std::shared_ptr AbilityManagerService::GetStackManagerByUse return nullptr; } +#ifdef SUPPORT_GRAPHICS std::shared_ptr AbilityManagerService::GetListManagerByUserId(int32_t userId) { auto it = missionListManagers_.find(userId); @@ -3071,6 +3125,7 @@ std::shared_ptr AbilityManagerService::GetListManagerByUserI HILOG_ERROR("%{public}s, Failed to get Manager. UserId = %{public}d", __func__, userId); return nullptr; } +#endif std::shared_ptr AbilityManagerService::GetConnectManagerByUserId(int32_t userId) { @@ -3146,7 +3201,7 @@ std::shared_ptr AbilityManagerService::GetDataAbilityManager return nullptr; } - +#ifdef SUPPORT_GRAPHICS int AbilityManagerService::MoveMissionToFloatingStack(const MissionOption &missionOption) { HILOG_INFO("Move mission to floating stack."); @@ -3158,6 +3213,7 @@ int AbilityManagerService::MoveMissionToSplitScreenStack(const MissionOption &pr HILOG_INFO("Move mission to split screen stack."); return currentStackManager_->MoveMissionToSplitScreenStack(primary, secondary); } +#endif int AbilityManagerService::ChangeFocusAbility( const sptr &lostFocusToken, const sptr &getFocusToken) @@ -3178,6 +3234,7 @@ int AbilityManagerService::ChangeFocusAbility( return currentStackManager_->ChangeFocusAbility(lostFocusToken, getFocusToken); } +#ifdef SUPPORT_GRAPHICS int AbilityManagerService::MinimizeMultiWindow(int missionId) { HILOG_INFO("Minimize multi window."); @@ -3228,6 +3285,7 @@ bool AbilityManagerService::IsFirstInMission(const sptr &token) } return stackManager->IsFirstInMission(token); } +#endif int AbilityManagerService::CompelVerifyPermission(const std::string &permission, int pid, int uid, std::string &message) { @@ -3235,6 +3293,7 @@ int AbilityManagerService::CompelVerifyPermission(const std::string &permission, return DelayedSingleton::GetInstance()->CompelVerifyPermission(permission, pid, uid, message); } +#ifdef SUPPORT_GRAPHICS int AbilityManagerService::PowerOff() { HILOG_INFO("Power off."); @@ -3274,6 +3333,7 @@ int AbilityManagerService::UnlockMission(int missionId) HILOG_DEBUG("locker uid :%{public}d, pid :%{public}d. isSystemApp: %{public}d", callerUid, callerPid, isSystemApp); return currentStackManager_->StartLockMission(callerUid, missionId, isSystemApp, false); } +#endif int AbilityManagerService::GetUidByBundleName(std::string bundleName) { @@ -3328,6 +3388,7 @@ void AbilityManagerService::StartSystemApplication() StartupResidentProcess(U0_USER_ID); } +#ifdef SUPPORT_GRAPHICS void AbilityManagerService::StartingSystemUiAbility() { HILOG_DEBUG("%{public}s", __func__); @@ -3347,7 +3408,7 @@ void AbilityManagerService::StartingSystemUiAbility() } (void)StartAbility(systemUiWant, U0_USER_ID, DEFAULT_INVAL_VALUE); } - +#endif void AbilityManagerService::ConnectBmsService() { @@ -3393,12 +3454,14 @@ int AbilityManagerService::GetWantSenderInfo(const sptr &target, st return pendingWantManager_->GetWantSenderInfo(target, info); } +#ifdef SUPPORT_GRAPHICS void AbilityManagerService::UpdateLockScreenState(bool isLockScreen) { HILOG_DEBUG("%{public}s begin", __func__); CHECK_POINTER(currentStackManager_); currentStackManager_->UpdateLockScreenState(isLockScreen); } +#endif /** * Get system memory information. @@ -3473,6 +3536,7 @@ bool AbilityManagerService::IsRamConstrainedDevice() return isRamConstrainedDevice; } +#ifdef SUPPORT_GRAPHICS int AbilityManagerService::GetMissionSaveTime() const { if (!amsConfigResolver_) { @@ -3505,6 +3569,7 @@ sptr AbilityManagerService::GetAbilityTokenByMissionId(int32_t mi } return currentMissionListManager_->GetAbilityTokenByMissionId(missionId); } +#endif void AbilityManagerService::StartingSettingsDataAbility() { @@ -3776,6 +3841,7 @@ void AbilityManagerService::ClearUserData(int32_t userId) pendingWantManagers_.erase(userId); } +#ifdef SUPPORT_GRAPHICS int AbilityManagerService::RegisterSnapshotHandler(const sptr& handler) { auto isSaCall = AAFwk::PermissionVerification::GetInstance()->IsSACall(); @@ -3842,14 +3908,17 @@ void AbilityManagerService::StopFreezingScreen() { HILOG_INFO("%{public}s", __func__); } +#endif void AbilityManagerService::UserStarted(int32_t userId) { HILOG_INFO("%{public}s", __func__); InitConnectManager(userId, false); +#ifdef SUPPORT_GRAPHICS SetStackManager(userId, false); InitMissionListManager(userId, false); InitDataAbilityManager(userId, false); +#endif InitPendWantManager(userId, false); } @@ -3865,13 +3934,16 @@ void AbilityManagerService::SwitchManagers(int32_t userId, bool switchUser) { HILOG_INFO("%{public}s, SwitchManagers:%{public}d-----begin", __func__, userId); InitConnectManager(userId, switchUser); +#ifdef SUPPORT_GRAPHICS SetStackManager(userId, switchUser); InitMissionListManager(userId, switchUser); +#endif InitDataAbilityManager(userId, switchUser); InitPendWantManager(userId, switchUser); HILOG_INFO("%{public}s, SwitchManagers:%{public}d-----end", __func__, userId); } +#ifdef SUPPORT_GRAPHICS void AbilityManagerService::PauseOldUser(int32_t userId) { HILOG_INFO("%{public}s, PauseOldUser:%{public}d-----begin", __func__, userId); @@ -3912,10 +3984,12 @@ void AbilityManagerService::PauseOldStackManager(int32_t userId) } manager->PauseManager(); } +#endif void AbilityManagerService::StartUserApps(int32_t userId) { HILOG_INFO("StartUserApps, userId:%{public}d, currentUserId:%{public}d", userId, GetUserId()); +#ifdef SUPPORT_GRAPHICS if (useNewMission_) { if (currentMissionListManager_ && currentMissionListManager_->IsStarted()) { HILOG_INFO("missionListManager ResumeManager"); @@ -3929,6 +4003,7 @@ void AbilityManagerService::StartUserApps(int32_t userId) return; } } +#endif StartSystemAbilityByUser(userId); } @@ -3940,7 +4015,9 @@ void AbilityManagerService::StartSystemAbilityByUser(int32_t userId) if (!amsConfigResolver_ || amsConfigResolver_->NonConfigFile()) { HILOG_INFO("start all"); StartingLauncherAbility(); +#ifdef SUPPORT_GRAPHICS StartingScreenLockAbility(); +#endif return; } @@ -3949,9 +4026,11 @@ void AbilityManagerService::StartSystemAbilityByUser(int32_t userId) StartingLauncherAbility(); } +#ifdef SUPPORT_GRAPHICS if (amsConfigResolver_->GetStartScreenLockState()) { StartingScreenLockAbility(); } +#endif if (amsConfigResolver_->GetPhoneServiceState()) { HILOG_INFO("start phone service"); @@ -4072,9 +4151,11 @@ int AbilityManagerService::SendANRProcessID(int pid) HILOG_ERROR("Kill app not response process failed"); } }; +#ifdef SUPPORT_GRAPHICS if (!SetANRMissionByProcessID(pid)) { HILOG_ERROR("Set app not response mission record failed"); } +#endif handler_->PostTask(timeoutTask, "TIME_OUT_TASK", anrTimeOut); if (kill(pid, SIGUSR1) != ERR_OK) { HILOG_ERROR("Send sig to app not response process failed"); @@ -4295,6 +4376,7 @@ int AbilityManagerService::DoAbilityBackground(const sptr &token, return ret; } +#ifdef SUPPORT_GRAPHICS int AbilityManagerService::DelegatorMoveMissionToFront(int32_t missionId) { HILOG_INFO("enter missionId : %{public}d", missionId); @@ -4312,6 +4394,7 @@ int32_t AbilityManagerService::ShowPickerDialog(const Want& want, int32_t userId bms->QueryAbilityInfos(want, AppExecFwk::AbilityInfoFlag::GET_ABILITY_INFO_WITH_APPLICATION, userId, abilityInfos); return Ace::UIServiceMgrClient::GetInstance()->ShowAppPickerDialog(want, abilityInfos, userId); } +#endif void AbilityManagerService::UpdateCallerInfo(Want& want) { @@ -4343,6 +4426,7 @@ bool AbilityManagerService::JudgeMultiUserConcurrency(const AppExecFwk::AbilityI return true; } +#ifdef SUPPORT_GRAPHICS void AbilityManagerService::StartingScreenLockAbility() { HILOG_DEBUG("%{public}s", __func__); @@ -4371,6 +4455,7 @@ void AbilityManagerService::StartingScreenLockAbility() (void)StartAbility(screenLockWant, userId, DEFAULT_INVAL_VALUE); } } +#endif int AbilityManagerService::ForceTimeoutForTest(const std::string &abilityName, const std::string &state) { @@ -4477,6 +4562,7 @@ bool AbilityManagerService::VerifyUriPermisson(const AbilityRequest &abilityRequ return false; } +#ifdef SUPPORT_GRAPHICS bool AbilityManagerService::SetANRMissionByProcessID(int pid) { HILOG_INFO("start."); @@ -4504,6 +4590,7 @@ bool AbilityManagerService::SetANRMissionByProcessID(int pid) } return true; } +#endif void AbilityManagerService::StartupResidentProcess(int userId) { diff --git a/services/abilitymgr/src/ability_record.cpp b/services/abilitymgr/src/ability_record.cpp index 4e5c371d0fb..030abd906f3 100644 --- a/services/abilitymgr/src/ability_record.cpp +++ b/services/abilitymgr/src/ability_record.cpp @@ -271,6 +271,7 @@ int AbilityRecord::TerminateAbility() return DelayedSingleton::GetInstance()->TerminateAbility(token_); } +#ifdef SUPPORT_GRAPHICS void AbilityRecord::SetMissionRecord(const std::shared_ptr &missionRecord) { missionRecord_ = missionRecord; @@ -301,6 +302,7 @@ int AbilityRecord::GetMissionRecordId() const } return DEFAULT_INVAL_VALUE; } +#endif const AppExecFwk::AbilityInfo &AbilityRecord::GetAbilityInfo() const { @@ -424,10 +426,12 @@ bool AbilityRecord::IsReady() const return isReady_; } +#ifdef SUPPORT_GRAPHICS bool AbilityRecord::IsWindowAttached() const { return isWindowAttached_; } +#endif bool AbilityRecord::IsLauncherAbility() const { @@ -656,12 +660,14 @@ void AbilityRecord::RestoreAbilityState() isRestarting_ = false; } +#ifdef SUPPORT_GRAPHICS void AbilityRecord::TopActiveAbilityChanged(bool flag) { HILOG_INFO("%{public}s called, isTop: %{public}d", __func__, flag); CHECK_POINTER(scheduler_); scheduler_->NotifyTopActiveAbilityChanged(flag); } +#endif void AbilityRecord::SetWant(const Want &want) { @@ -786,6 +792,7 @@ std::shared_ptr AbilityRecord::GetCallerRecord() const return callerList_.back()->GetCaller(); } +#ifdef SUPPORT_GRAPHICS void AbilityRecord::AddWindowInfo(int windowToken) { windowInfo_ = std::make_shared(windowToken); @@ -796,6 +803,7 @@ void AbilityRecord::RemoveWindowInfo() { windowInfo_.reset(); } +#endif bool AbilityRecord::IsConnectListEmpty() { @@ -840,10 +848,12 @@ void AbilityRecord::GetAbilityTypeString(std::string &typeStr) { AppExecFwk::AbilityType type = GetAbilityInfo().type; switch (type) { +#ifdef SUPPORT_GRAPHICS case AppExecFwk::AbilityType::PAGE: { typeStr = "PAGE"; break; } +#endif case AppExecFwk::AbilityType::SERVICE: { typeStr = "SERVICE"; break; @@ -1174,6 +1184,7 @@ void AbilityRecord::SendEvent(uint32_t msg, uint32_t timeOut) handler->SendEvent(msg, eventId_, timeOut); } +#ifdef SUPPORT_GRAPHICS bool AbilityRecord::SupportMultWindow() const { // LauncherAbility don't support multi window display. @@ -1190,6 +1201,7 @@ void AbilityRecord::NotifyMultiWinModeChanged(const AbilityWindowConfiguration & CHECK_POINTER(scheduler_); scheduler_->NotifyMultiWinModeChanged(static_cast(winModeKey), flag); } +#endif void AbilityRecord::SetInMovingState(bool isMoving) { @@ -1270,6 +1282,7 @@ void AbilityRecord::ClearFlag() appState_ = AppState::END; } +#ifdef SUPPORT_GRAPHICS void AbilityRecord::SetLockScreenState(const bool isLock) { isLockScreenState_ = isLock; @@ -1279,6 +1292,7 @@ bool AbilityRecord::GetLockScreenState() const { return isLockScreenState_; } +#endif void AbilityRecord::SetMovingBackgroundFlag(bool isMoving) { @@ -1290,6 +1304,7 @@ bool AbilityRecord::IsMovingBackground() const return isMovingBackground_; } +#ifdef SUPPORT_GRAPHICS void AbilityRecord::SetLockScreenRoot() { isLockScreenRoot_ = true; @@ -1309,6 +1324,7 @@ bool AbilityRecord::GetPowerStateLockScreen() const { return isPowerStateLockScreen_; } +#endif bool AbilityRecord::IsNewVersion() { @@ -1333,6 +1349,7 @@ void AbilityRecord::NotifyContinuationResult(int32_t result) lifecycleDeal_->NotifyContinuationResult(result); } +#ifdef SUPPORT_GRAPHICS std::shared_ptr AbilityRecord::GetOwnedMissionList() const { return missionList_.lock(); @@ -1356,6 +1373,7 @@ void AbilityRecord::SetMission(const std::shared_ptr &mission) } mission_ = mission; } +#endif void AbilityRecord::SetMinimizeReason(bool fromUser) { @@ -1367,6 +1385,7 @@ bool AbilityRecord::IsMinimizeFromUser() const return minimizeReason_; } +#ifdef SUPPORT_GRAPHICS std::shared_ptr AbilityRecord::GetMission() const { return mission_.lock(); @@ -1376,6 +1395,7 @@ int32_t AbilityRecord::GetMissionId() const { return missionId_; } +#endif void AbilityRecord::SetSpecifiedFlag(const std::string &flag) { diff --git a/services/abilitymgr/src/ability_scheduler_proxy.cpp b/services/abilitymgr/src/ability_scheduler_proxy.cpp index 557d9c42a52..f297a56b510 100755 --- a/services/abilitymgr/src/ability_scheduler_proxy.cpp +++ b/services/abilitymgr/src/ability_scheduler_proxy.cpp @@ -647,6 +647,7 @@ int AbilitySchedulerProxy::BatchInsert(const Uri &uri, const std::vector &values) override; +#ifdef SUPPORT_GRAPHICS void NotifyMultiWinModeChanged(int32_t winModeKey, bool flag) override; - Uri NormalizeUri(const Uri &uri) override; - Uri DenormalizeUri(const Uri &uri) override; void NotifyTopActiveAbilityChanged(bool flag) override { }; +#endif + + Uri NormalizeUri(const Uri &uri) override; + Uri DenormalizeUri(const Uri &uri) override; virtual bool ScheduleRegisterObserver(const Uri &uri, const sptr &dataObserver) override { return true; diff --git a/services/abilitymgr/test/mock/libs/aakit/src/ability_scheduler.cpp b/services/abilitymgr/test/mock/libs/aakit/src/ability_scheduler.cpp index ee36c99f9a6..e1c685724c9 100644 --- a/services/abilitymgr/test/mock/libs/aakit/src/ability_scheduler.cpp +++ b/services/abilitymgr/test/mock/libs/aakit/src/ability_scheduler.cpp @@ -115,8 +115,11 @@ int AbilityScheduler::BatchInsert(const Uri &uri, const std::vector ¶ms, std::vector &info)); diff --git a/services/abilitymgr/test/unittest/phone/ability_scheduler_stub_test/ability_schedule_stub_mock.h b/services/abilitymgr/test/unittest/phone/ability_scheduler_stub_test/ability_schedule_stub_mock.h old mode 100755 new mode 100644 index ce061009455..6aa2a97b307 --- a/services/abilitymgr/test/unittest/phone/ability_scheduler_stub_test/ability_schedule_stub_mock.h +++ b/services/abilitymgr/test/unittest/phone/ability_scheduler_stub_test/ability_schedule_stub_mock.h @@ -107,11 +107,14 @@ public: return urivalue; } +#ifdef SUPPORT_GRAPHICS void NotifyMultiWinModeChanged(int32_t winModeKey, bool flag) override {} void NotifyTopActiveAbilityChanged(bool flag) override {} +#endif + virtual bool ScheduleRegisterObserver(const Uri &uri, const sptr &dataObserver) override { return true; diff --git a/services/abilitymgr/test/unittest/phone/ability_stack_manager_test/ability_stack_manager_test.cpp b/services/abilitymgr/test/unittest/phone/ability_stack_manager_test/ability_stack_manager_test.cpp index cc177c0234a..b16d19871ed 100644 --- a/services/abilitymgr/test/unittest/phone/ability_stack_manager_test/ability_stack_manager_test.cpp +++ b/services/abilitymgr/test/unittest/phone/ability_stack_manager_test/ability_stack_manager_test.cpp @@ -3462,6 +3462,7 @@ HWTEST_F(AbilityStackManagerTest, ability_stack_manager_operating_093, TestSize. */ HWTEST_F(AbilityStackManagerTest, ability_stack_manager_operating_094, TestSize.Level1) { +#ifdef SUPPORT_GRAPHICS stackManager_->Init(); stackManager_->curSysWindowMode_ = SystemWindowMode::SPLITSCREEN_WINDOW_MODE; @@ -3474,6 +3475,7 @@ HWTEST_F(AbilityStackManagerTest, ability_stack_manager_operating_094, TestSize. index = mode.find(split); EXPECT_TRUE(index != std::string::npos); } +#endif } /* @@ -3638,6 +3640,7 @@ HWTEST_F(AbilityStackManagerTest, ability_stack_manager_operating_099, TestSize. */ HWTEST_F(AbilityStackManagerTest, ability_stack_manager_operating_0100, TestSize.Level1) { +#ifdef SUPPORT_GRAPHICS std::shared_ptr abilityRecord = nullptr; auto str = stackManager_->ConvertWindowModeState(SystemWindowMode::DEFAULT_WINDOW_MODE); EXPECT_EQ(str, "default window mode"); @@ -3647,6 +3650,7 @@ HWTEST_F(AbilityStackManagerTest, ability_stack_manager_operating_0100, TestSize EXPECT_EQ(str, "floating window mode"); str = stackManager_->ConvertWindowModeState(SystemWindowMode::FLOATING_AND_SPLITSCREEN_WINDOW_MODE); EXPECT_EQ(str, "floating and split screen window mode"); +#endif } /* @@ -3750,6 +3754,7 @@ HWTEST_F(AbilityStackManagerTest, ability_stack_manager_operating_0103, TestSize */ HWTEST_F(AbilityStackManagerTest, ability_stack_manager_operating_0104, TestSize.Level1) { +#ifdef SUPPORT_GRAPHICS stackManager_->Init(); auto result = stackManager_->StartAbility(radioAbilityRequest_); @@ -3773,6 +3778,7 @@ HWTEST_F(AbilityStackManagerTest, ability_stack_manager_operating_0104, TestSize ref = stackManager_->CheckMultiWindowCondition(missionOptions); EXPECT_EQ(MOVE_MISSION_TO_STACK_NOT_EXIST_MISSION, ref); +#endif } /* @@ -3785,6 +3791,7 @@ HWTEST_F(AbilityStackManagerTest, ability_stack_manager_operating_0104, TestSize */ HWTEST_F(AbilityStackManagerTest, ability_stack_manager_operating_0105, TestSize.Level1) { +#ifdef SUPPORT_GRAPHICS stackManager_->Init(); auto result = stackManager_->StartAbility(radioAbilityRequest_); EXPECT_EQ(0, result); @@ -3798,6 +3805,7 @@ HWTEST_F(AbilityStackManagerTest, ability_stack_manager_operating_0105, TestSize missionOptions.push_back(mission); auto ref = stackManager_->CheckMultiWindowCondition(missionOptions); EXPECT_EQ(ERR_OK, ref); +#endif } /* diff --git a/services/abilitymgr/test/unittest/phone/ability_with_applications_test/mock_ability_scheduler.cpp b/services/abilitymgr/test/unittest/phone/ability_with_applications_test/mock_ability_scheduler.cpp index 2d87beb1c92..2f943efd7b5 100644 --- a/services/abilitymgr/test/unittest/phone/ability_with_applications_test/mock_ability_scheduler.cpp +++ b/services/abilitymgr/test/unittest/phone/ability_with_applications_test/mock_ability_scheduler.cpp @@ -107,8 +107,11 @@ int AbilityScheduler::BatchInsert(const Uri &uri, const std::vector(2)); EXPECT_EQ(infos.format, static_cast(3)); EXPECT_EQ(infos.data, nullptr); +#endif } /* @@ -101,6 +103,7 @@ HWTEST_F(ScreenShotHandlerTest, ability_screenshot_response_001, TestSize.Level1 */ HWTEST_F(ScreenShotHandlerTest, ability_screenshot_handler_001, TestSize.Level1) { +#ifdef SUPPORT_GRAPHICS int missionId = 0; OHOS::WMImageInfo info; info.width = 1; @@ -117,6 +120,7 @@ HWTEST_F(ScreenShotHandlerTest, ability_screenshot_handler_001, TestSize.Level1) EXPECT_EQ(imageInfo.height, static_cast(2)); EXPECT_EQ(imageInfo.format, static_cast(3)); EXPECT_EQ(imageInfo.data, nullptr); +#endif } /* diff --git a/services/appmgr/BUILD.gn b/services/appmgr/BUILD.gn index e7604b6b05a..406f0fbf59c 100644 --- a/services/appmgr/BUILD.gn +++ b/services/appmgr/BUILD.gn @@ -13,6 +13,7 @@ import("//build/ohos.gni") import("//foundation/aafwk/standard/aafwk.gni") +import("//foundation/aafwk/standard/feature.gni") config("appmgr_config") { include_dirs = [ @@ -79,7 +80,6 @@ ohos_shared_library("libams") { "${innerkits_path}/uri_permission:uri_permission_mgr", "${services_path}/common:perm_verification", "//base/account/os_account/frameworks/osaccount/native:os_account_innerkits", - "//base/global/i18n_standard/frameworks/intl:intl_util", "//base/security/permission/interfaces/innerkits/permission_standard/permissionsdk:libpermissionsdk_standard", "//foundation/aafwk/standard/interfaces/innerkits/base:base", "//foundation/aafwk/standard/interfaces/innerkits/want:want", @@ -88,6 +88,10 @@ ohos_shared_library("libams") { "//utils/native/base:utils", ] + if (ability_runtime_graphics) { + deps += [ "//base/global/i18n_standard/frameworks/intl:intl_util" ] + } + external_deps = [ "appspawn:appspawn_socket_client", "bundle_framework:appexecfwk_core", diff --git a/services/appmgr/src/app_mgr_service_inner.cpp b/services/appmgr/src/app_mgr_service_inner.cpp index ea20cac741e..9e9d652a228 100644 --- a/services/appmgr/src/app_mgr_service_inner.cpp +++ b/services/appmgr/src/app_mgr_service_inner.cpp @@ -41,7 +41,9 @@ #include "permission_constants.h" #include "permission_verification.h" #include "system_ability_definition.h" +#ifdef SUPPORT_GRAPHICS #include "locale_config.h" +#endif #include "uri_permission_manager_client.h" @@ -2154,10 +2156,13 @@ void AppMgrServiceInner::GetGlobalConfiguration() APP_LOGE("configuration_ is null"); return; } + +#ifdef SUPPORT_GRAPHICS // Currently only this interface is known auto language = OHOS::Global::I18n::LocaleConfig::GetSystemLanguage(); APP_LOGI("current global language is : %{public}s", language.c_str()); configuration_->AddItem(GlobalConfigurationKey::SYSTEM_LANGUAGE, language); +#endif // Assign to default colormode "light" APP_LOGI("current global colormode is : %{public}s", ConfigurationInner::COLOR_MODE_LIGHT.c_str()); diff --git a/services/appmgr/test/BUILD.gn b/services/appmgr/test/BUILD.gn index 4f1eee18f96..4b81c3f8440 100644 --- a/services/appmgr/test/BUILD.gn +++ b/services/appmgr/test/BUILD.gn @@ -13,6 +13,7 @@ import("//build/ohos.gni") import("//foundation/aafwk/standard/aafwk.gni") +import("//foundation/aafwk/standard/feature.gni") config("appmgr_test_config") { configs = [ @@ -81,7 +82,6 @@ ohos_source_set("appmgr_test_source") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ - "//base/global/i18n_standard/frameworks/intl:intl_util", "//base/security/permission/interfaces/innerkits/permission_standard/permissionsdk:libpermissionsdk_standard", "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", "//foundation/aafwk/standard/interfaces/innerkits/base:base", @@ -90,6 +90,10 @@ ohos_source_set("appmgr_test_source") { "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", ] + if (ability_runtime_graphics) { + deps += [ "//base/global/i18n_standard/frameworks/intl:intl_util" ] + } + external_deps = [ "bundle_framework:appexecfwk_core", "bytrace_standard:bytrace_core", diff --git a/services/test/mock/include/mock_ability_scheduler.h b/services/test/mock/include/mock_ability_scheduler.h old mode 100755 new mode 100644 index a5ab5274fef..7796b1ea2ac --- a/services/test/mock/include/mock_ability_scheduler.h +++ b/services/test/mock/include/mock_ability_scheduler.h @@ -35,8 +35,10 @@ public: MOCK_METHOD1(ScheduleRestoreAbilityState, void(const PacMap &inState)); MOCK_METHOD1(ScheduleUpdateConfiguration, void(const AppExecFwk::Configuration &config)); MOCK_METHOD1(ScheduleNewWant, void(const Want &want)); +#ifdef SUPPORT_GRAPHICS MOCK_METHOD1(NotifyTopActiveAbilityChanged, void(bool flag)); MOCK_METHOD2(NotifyMultiWinModeChanged, void(int32_t winModeKey, bool flag)); +#endif MOCK_METHOD2(ScheduleRegisterObserver, bool(const Uri &uri, const sptr &dataObserver)); MOCK_METHOD2( ScheduleUnregisterObserver, bool(const Uri &uri, const sptr &dataObserver)); diff --git a/services/test/mock/include/mock_ability_scheduler_stub.h b/services/test/mock/include/mock_ability_scheduler_stub.h old mode 100755 new mode 100644 index 5e36df317ad..aef6a8449f7 --- a/services/test/mock/include/mock_ability_scheduler_stub.h +++ b/services/test/mock/include/mock_ability_scheduler_stub.h @@ -43,8 +43,10 @@ public: MOCK_METHOD2(BatchInsert, int(const Uri &uri, const std::vector &values)); MOCK_METHOD1(NormalizeUri, Uri(const Uri &)); MOCK_METHOD1(DenormalizeUri, Uri(const Uri &)); +#ifdef SUPPORT_GRAPHICS MOCK_METHOD2(NotifyMultiWinModeChanged, void(int32_t winModeKey, bool flag)); MOCK_METHOD1(NotifyTopActiveAbilityChanged, void(bool flag)); +#endif MOCK_METHOD2(ScheduleRegisterObserver, bool(const Uri &uri, const sptr &dataObserver)); MOCK_METHOD2( ScheduleUnregisterObserver, bool(const Uri &uri, const sptr &dataObserver)); diff --git a/services/test/moduletest/ability_mgr_service_test/BUILD.gn b/services/test/moduletest/ability_mgr_service_test/BUILD.gn index e25767356bc..b4493e804b2 100644 --- a/services/test/moduletest/ability_mgr_service_test/BUILD.gn +++ b/services/test/moduletest/ability_mgr_service_test/BUILD.gn @@ -13,6 +13,7 @@ import("//build/test.gni") import("//foundation/aafwk/standard/aafwk.gni") +import("//foundation/aafwk/standard/feature.gni") module_output_path = "ability_runtime/mstabilitymgrservice" @@ -27,7 +28,9 @@ ohos_moduletest("ability_mgr_module_test") { "//base/hiviewdfx/hicollie/interfaces/native/innerkits/include/xcollie", ] - sources = [ "ability_mgr_module_test.cpp" ] + sources = [ + "ability_mgr_module_test.cpp", + ] sources += [ "//foundation/aafwk/standard/services/abilitymgr/src/ability_connect_callback_stub.cpp", "//foundation/aafwk/standard/services/abilitymgr/src/ability_connect_manager.cpp", @@ -91,23 +94,28 @@ ohos_moduletest("ability_mgr_module_test") { "${innerkits_path}/want:want", "${services_path}/common:perm_verification", "//base/account/os_account/frameworks/osaccount/native:os_account_innerkits", - "//base/global/i18n_standard/frameworks/intl:intl_util", "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", "//foundation/aafwk/standard/services/abilitymgr:abilityms", - "//foundation/ace/ace_engine/interfaces/innerkits/ui_service_manager:ui_service_mgr", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", - "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//third_party/jsoncpp:jsoncpp", - "//third_party/libpng:libpng", "//utils/native/base:utils", ] + if (ability_runtime_graphics) { + deps += [ + "//base/global/i18n_standard/frameworks/intl:intl_util", + "//foundation/ace/ace_engine/interfaces/innerkits/ui_service_manager:ui_service_mgr", + "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", + "//third_party/libpng:libpng", + ] + } + external_deps = [ "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_core", diff --git a/services/test/moduletest/ability_record_test/BUILD.gn b/services/test/moduletest/ability_record_test/BUILD.gn index 0c2de1e795c..db3541ac791 100644 --- a/services/test/moduletest/ability_record_test/BUILD.gn +++ b/services/test/moduletest/ability_record_test/BUILD.gn @@ -13,6 +13,7 @@ import("//build/test.gni") import("//foundation/aafwk/standard/aafwk.gni") +import("//foundation/aafwk/standard/feature.gni") module_output_path = "ability_runtime/mstabilitymgrservice" EVENT_DIR = "//base/notification/ces_standard" @@ -95,25 +96,30 @@ ohos_moduletest("AbilityRecordModuleTest") { "${innerkits_path}/want:want", "${services_path}/common:perm_verification", "//base/account/os_account/frameworks/osaccount/native:os_account_innerkits", - "//base/global/i18n_standard/frameworks/intl:intl_util", "//base/startup/syspara_lite/interfaces/innerkits/native/syspara:syspara", "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", "//foundation/aafwk/standard/services/abilitymgr:abilityms", - "//foundation/ace/ace_engine/interfaces/innerkits/ui_service_manager:ui_service_mgr", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", - "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//third_party/jsoncpp:jsoncpp", - "//third_party/libpng:libpng", "//utils/native/base:utilsbase", ] + if (ability_runtime_graphics) { + deps += [ + "//base/global/i18n_standard/frameworks/intl:intl_util", + "//foundation/ace/ace_engine/interfaces/innerkits/ui_service_manager:ui_service_mgr", + "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", + "//third_party/libpng:libpng", + ] + } + external_deps = [ "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_core", @@ -133,5 +139,7 @@ ohos_moduletest("AbilityRecordModuleTest") { group("moduletest") { testonly = true - deps = [ ":AbilityRecordModuleTest" ] + deps = [ + ":AbilityRecordModuleTest", + ] } diff --git a/services/test/moduletest/ability_stack_test/BUILD.gn b/services/test/moduletest/ability_stack_test/BUILD.gn index 84467eb03d2..f9e3d5abaee 100644 --- a/services/test/moduletest/ability_stack_test/BUILD.gn +++ b/services/test/moduletest/ability_stack_test/BUILD.gn @@ -13,6 +13,7 @@ import("//build/test.gni") import("//foundation/aafwk/standard/aafwk.gni") +import("//foundation/aafwk/standard/feature.gni") module_output_path = "ability_runtime/mstabilitymgrservice" @@ -27,7 +28,9 @@ ohos_moduletest("ability_stack_module_test") { "//base/hiviewdfx/hicollie/interfaces/native/innerkits/include/xcollie", ] - sources = [ "ability_stack_module_test.cpp" ] + sources = [ + "ability_stack_module_test.cpp", + ] sources += [ "//foundation/aafwk/standard/services/abilitymgr/src/ability_connect_callback_stub.cpp", "//foundation/aafwk/standard/services/abilitymgr/src/ability_connect_manager.cpp", @@ -93,23 +96,28 @@ ohos_moduletest("ability_stack_module_test") { "${innerkits_path}/want:want", "${services_path}/common:perm_verification", "//base/account/os_account/frameworks/osaccount/native:os_account_innerkits", - "//base/global/i18n_standard/frameworks/intl:intl_util", "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", "//foundation/aafwk/standard/services/abilitymgr:abilityms", - "//foundation/ace/ace_engine/interfaces/innerkits/ui_service_manager:ui_service_mgr", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", - "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//third_party/jsoncpp:jsoncpp", - "//third_party/libpng:libpng", "//utils/native/base:utils", ] + if (ability_runtime_graphics) { + deps += [ + "//base/global/i18n_standard/frameworks/intl:intl_util", + "//foundation/ace/ace_engine/interfaces/innerkits/ui_service_manager:ui_service_mgr", + "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", + "//third_party/libpng:libpng", + ] + } + external_deps = [ "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_core", @@ -129,5 +137,7 @@ ohos_moduletest("ability_stack_module_test") { group("moduletest") { testonly = true - deps = [ ":ability_stack_module_test" ] + deps = [ + ":ability_stack_module_test", + ] } diff --git a/services/test/moduletest/ability_stack_test/ability_stack_module_test.cpp b/services/test/moduletest/ability_stack_test/ability_stack_module_test.cpp index d6ba767c0a7..486e916d372 100644 --- a/services/test/moduletest/ability_stack_test/ability_stack_module_test.cpp +++ b/services/test/moduletest/ability_stack_test/ability_stack_module_test.cpp @@ -2190,8 +2190,10 @@ HWTEST_F(AbilityStackModuleTest, ability_stack_test_044, TestSize.Level1) EXPECT_CALL(*scheduler, AsObject()).WillRepeatedly(Return(nullptr)); topAbilityRecord->SetScheduler(scheduler); +#ifdef SUPPORT_GRAPHICS EXPECT_CALL(*scheduler, NotifyMultiWinModeChanged(testing::_, testing::_)).Times(1); EXPECT_CALL(*scheduler, NotifyTopActiveAbilityChanged(testing::_)).Times(2); +#endif EXPECT_EQ(topAbilityRecord->GetMissionStackId(), FLOATING_MISSION_STACK_ID); @@ -2308,11 +2310,13 @@ HWTEST_F(AbilityStackModuleTest, ability_stack_test_046, TestSize.Level1) EXPECT_CALL(*schedulerluncher, AsObject()).WillRepeatedly(Return(nullptr)); topAbilityRecordlauncher->SetScheduler(schedulerluncher); +#ifdef SUPPORT_GRAPHICS auto getFocusChangeFlag = [](bool flag) { EXPECT_TRUE(flag); }; EXPECT_CALL(*schedulerluncher, NotifyTopActiveAbilityChanged(testing::_)) .Times(testing::AtLeast(1)) .WillOnce(testing::Invoke(getFocusChangeFlag)); +#endif EXPECT_FALSE(musicAbilityRecord->IsToEnd()); @@ -2358,6 +2362,7 @@ HWTEST_F(AbilityStackModuleTest, ability_stack_test_047, TestSize.Level1) EXPECT_CALL(*schedulerluncher, AsObject()).WillRepeatedly(Return(nullptr)); topAbilityRecordLuncher->SetScheduler(schedulerluncher); +#ifdef SUPPORT_GRAPHICS auto getFocusChangeFlag = [](bool flag) { EXPECT_TRUE(flag); }; auto loseFocusChangeFlag = [](bool flag) { EXPECT_FALSE(flag); }; @@ -2373,6 +2378,7 @@ HWTEST_F(AbilityStackModuleTest, ability_stack_test_047, TestSize.Level1) EXPECT_CALL(*scheduler, NotifyTopActiveAbilityChanged(testing::_)) .Times(testing::AtLeast(1)) .WillOnce(testing::Invoke(loseFocusChangeFlag)); +#endif // make sure both are active topAbilityRecordLuncher->SetAbilityState(OHOS::AAFwk::ACTIVE); @@ -2430,11 +2436,13 @@ HWTEST_F(AbilityStackModuleTest, ability_stack_test_048, TestSize.Level1) EXPECT_CALL(*schedulerMusic, AsObject()).WillRepeatedly(Return(nullptr)); musicAbilityRecord->SetScheduler(schedulerMusic); +#ifdef SUPPORT_GRAPHICS auto loseFocusChangeFlag = [](bool flag) { EXPECT_FALSE(flag); }; EXPECT_CALL(*schedulerMusic, NotifyTopActiveAbilityChanged(testing::_)) .Times(testing::AtLeast(1)) .WillOnce(testing::Invoke(loseFocusChangeFlag)); +#endif // set RadioAbility scheduler OHOS::sptr scheduler(new MockAbilityScheduler()); @@ -2485,6 +2493,7 @@ HWTEST_F(AbilityStackModuleTest, ability_stack_test_049, TestSize.Level1) EXPECT_CALL(*schedulerluncher, AsObject()).WillRepeatedly(Return(nullptr)); topAbilityRecordLuncher->SetScheduler(schedulerluncher); +#ifdef SUPPORT_GRAPHICS auto getFocusChangeFlag = [](bool flag) { EXPECT_TRUE(flag); }; auto loseFocusChangeFlag = [](bool flag) { EXPECT_FALSE(flag); }; @@ -2502,6 +2511,7 @@ HWTEST_F(AbilityStackModuleTest, ability_stack_test_049, TestSize.Level1) .Times(testing::AtLeast(1)) .WillOnce(testing::Invoke(loseFocusChangeFlag)) .WillOnce(testing::Invoke(getFocusChangeFlag)); +#endif // make sure both are active topAbilityRecordLuncher->SetAbilityState(OHOS::AAFwk::ACTIVE); @@ -3466,7 +3476,9 @@ HWTEST_F(AbilityStackModuleTest, ability_stack_test_068, TestSize.Level1) EXPECT_TRUE(topAbilityRecordRadio); topAbilityRecordRadio->SetAbilityState(OHOS::AAFwk::ACTIVE); +#ifdef SUPPORT_GRAPHICS EXPECT_EQ(stackManager_->curSysWindowMode_, SystemWindowMode::SPLITSCREEN_WINDOW_MODE); +#endif auto missionId = topAbilityRecordRadio->GetMissionRecordId(); ref = stackManager_->RemoveMissionRecordById(missionId); @@ -3520,7 +3532,9 @@ HWTEST_F(AbilityStackModuleTest, ability_stack_test_069, TestSize.Level1) auto topMissionRecordRadio = stackManager_->GetTopMissionRecord(); EXPECT_TRUE(topMissionRecordRadio); +#ifdef SUPPORT_GRAPHICS EXPECT_EQ(stackManager_->curSysWindowMode_, SystemWindowMode::SPLITSCREEN_WINDOW_MODE); +#endif auto stackId = topMissionRecordRadio->GetMissionStack()->GetMissionStackId(); stackManager_->RemoveStack(stackId); diff --git a/services/test/moduletest/common/ams/app_mgr_service_test/BUILD.gn b/services/test/moduletest/common/ams/app_mgr_service_test/BUILD.gn old mode 100755 new mode 100644 index 6d701509807..0bea52eeec4 --- a/services/test/moduletest/common/ams/app_mgr_service_test/BUILD.gn +++ b/services/test/moduletest/common/ams/app_mgr_service_test/BUILD.gn @@ -13,6 +13,7 @@ import("//build/test.gni") import("//foundation/aafwk/standard/aafwk.gni") +import("//foundation/aafwk/standard/feature.gni") module_output_path = "ability_runtime/mstappmgrservice" @@ -30,14 +31,19 @@ ohos_moduletest("AmsAppMgrServiceModuleTest") { deps = [ "${services_path}/common:perm_verification", "${services_path}/test/moduletest/common/ams:appmgr_mst_source", - "//base/global/i18n_standard/frameworks/intl:intl_util", ] + if (ability_runtime_graphics) { + deps += [ "//base/global/i18n_standard/frameworks/intl:intl_util" ] + } + external_deps = [ "ipc:ipc_core" ] } group("moduletest") { testonly = true - deps = [ ":AmsAppMgrServiceModuleTest" ] + deps = [ + ":AmsAppMgrServiceModuleTest", + ] } diff --git a/services/test/moduletest/common/ams/service_app_spawn_client_test/BUILD.gn b/services/test/moduletest/common/ams/service_app_spawn_client_test/BUILD.gn old mode 100755 new mode 100644 index 6240f1cf721..0f04b507f9d --- a/services/test/moduletest/common/ams/service_app_spawn_client_test/BUILD.gn +++ b/services/test/moduletest/common/ams/service_app_spawn_client_test/BUILD.gn @@ -13,6 +13,7 @@ import("//build/test.gni") import("//foundation/aafwk/standard/aafwk.gni") +import("//foundation/aafwk/standard/feature.gni") module_output_path = "ability_runtime/mstappmgrservice" @@ -31,14 +32,19 @@ ohos_moduletest("AmsServiceAppSpawnClientModuleTest") { deps = [ "${services_path}/common:perm_verification", "${services_path}/test/moduletest/common/ams:appmgr_mst_source", - "//base/global/i18n_standard/frameworks/intl:intl_util", ] + if (ability_runtime_graphics) { + deps += [ "//base/global/i18n_standard/frameworks/intl:intl_util" ] + } + external_deps = [ "ipc:ipc_core" ] } group("moduletest") { testonly = true - deps = [ ":AmsServiceAppSpawnClientModuleTest" ] + deps = [ + ":AmsServiceAppSpawnClientModuleTest", + ] } diff --git a/services/test/moduletest/common/ams/service_event_drive_test/BUILD.gn b/services/test/moduletest/common/ams/service_event_drive_test/BUILD.gn old mode 100755 new mode 100644 index 46b188d1397..58a5a8e3a55 --- a/services/test/moduletest/common/ams/service_event_drive_test/BUILD.gn +++ b/services/test/moduletest/common/ams/service_event_drive_test/BUILD.gn @@ -13,6 +13,7 @@ import("//build/test.gni") import("//foundation/aafwk/standard/aafwk.gni") +import("//foundation/aafwk/standard/feature.gni") module_output_path = "ability_runtime/mstappmgrservice" @@ -32,14 +33,19 @@ ohos_moduletest("AmsServiceEventDriveModuleTest") { deps = [ "${services_path}/common:perm_verification", "${services_path}/test/moduletest/common/ams:appmgr_mst_source", - "//base/global/i18n_standard/frameworks/intl:intl_util", ] + if (ability_runtime_graphics) { + deps += [ "//base/global/i18n_standard/frameworks/intl:intl_util" ] + } + external_deps = [ "ipc:ipc_core" ] } group("moduletest") { testonly = true - deps = [ ":AmsServiceEventDriveModuleTest" ] + deps = [ + ":AmsServiceEventDriveModuleTest", + ] } diff --git a/services/test/moduletest/common/ams/service_start_process_test/BUILD.gn b/services/test/moduletest/common/ams/service_start_process_test/BUILD.gn old mode 100755 new mode 100644 index 8074d13a603..256553dbd1c --- a/services/test/moduletest/common/ams/service_start_process_test/BUILD.gn +++ b/services/test/moduletest/common/ams/service_start_process_test/BUILD.gn @@ -13,6 +13,7 @@ import("//build/test.gni") import("//foundation/aafwk/standard/aafwk.gni") +import("//foundation/aafwk/standard/feature.gni") module_output_path = "ability_runtime/mstappmgrservice" @@ -29,14 +30,19 @@ ohos_moduletest("AmsServiceStartModuleTest") { deps = [ "${services_path}/common:perm_verification", "${services_path}/test/moduletest/common/ams:appmgr_mst_source", - "//base/global/i18n_standard/frameworks/intl:intl_util", ] + if (ability_runtime_graphics) { + deps += [ "//base/global/i18n_standard/frameworks/intl:intl_util" ] + } + external_deps = [ "ipc:ipc_core" ] } group("moduletest") { testonly = true - deps = [ ":AmsServiceStartModuleTest" ] + deps = [ + ":AmsServiceStartModuleTest", + ] } diff --git a/services/test/moduletest/dump_module_test/BUILD.gn b/services/test/moduletest/dump_module_test/BUILD.gn index 5be23fc2488..7368ef31851 100644 --- a/services/test/moduletest/dump_module_test/BUILD.gn +++ b/services/test/moduletest/dump_module_test/BUILD.gn @@ -12,6 +12,7 @@ # limitations under the License. import("//build/test.gni") import("//foundation/aafwk/standard/aafwk.gni") +import("//foundation/aafwk/standard/feature.gni") module_output_path = "ability_runtime/mstabilitymgrservice" @@ -50,7 +51,6 @@ ohos_moduletest("dump_module_test") { "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", "${services_path}/common:perm_verification", - "//base/global/i18n_standard/frameworks/intl:intl_util", "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", "//foundation/aafwk/standard/services/test/moduletest/module_test_dump_util:module_test_dump_util_lib", @@ -58,10 +58,16 @@ ohos_moduletest("dump_module_test") { "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", - "//third_party/libpng:libpng", "//utils/native/base:utils", ] + if (ability_runtime_graphics) { + deps += [ + "//base/global/i18n_standard/frameworks/intl:intl_util", + "//third_party/libpng:libpng", + ] + } + external_deps = [ "access_token:libaccesstoken_sdk", "bytrace_standard:bytrace_core", @@ -74,5 +80,7 @@ ohos_moduletest("dump_module_test") { group("moduletest") { testonly = true - deps = [ ":dump_module_test" ] + deps = [ + ":dump_module_test", + ] } diff --git a/services/test/moduletest/ipc_ability_connect_test/BUILD.gn b/services/test/moduletest/ipc_ability_connect_test/BUILD.gn index 487dc498f07..7c5a1b09a61 100644 --- a/services/test/moduletest/ipc_ability_connect_test/BUILD.gn +++ b/services/test/moduletest/ipc_ability_connect_test/BUILD.gn @@ -13,14 +13,16 @@ import("//build/test.gni") import("//foundation/aafwk/standard/aafwk.gni") +import("//foundation/aafwk/standard/feature.gni") module_output_path = "ability_runtime/mstabilitymgrservice" ohos_moduletest("IpcAbilityConnectModuleTest") { module_out_path = module_output_path - sources = - [ "${services_path}/abilitymgr/src/ability_connect_callback_stub.cpp" ] + sources = [ + "${services_path}/abilitymgr/src/ability_connect_callback_stub.cpp", + ] sources += [ "ipc_ability_connect_module_test.cpp" ] @@ -35,10 +37,13 @@ ohos_moduletest("IpcAbilityConnectModuleTest") { "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", - "//third_party/libpng:libpng", "//utils/native/base:utilsbase", ] + if (ability_runtime_graphics) { + deps += [ "//third_party/libpng:libpng" ] + } + external_deps = [ "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", @@ -48,5 +53,7 @@ ohos_moduletest("IpcAbilityConnectModuleTest") { group("moduletest") { testonly = true - deps = [ ":IpcAbilityConnectModuleTest" ] + deps = [ + ":IpcAbilityConnectModuleTest", + ] } diff --git a/services/test/moduletest/ipc_ability_mgr_test/BUILD.gn b/services/test/moduletest/ipc_ability_mgr_test/BUILD.gn index 59323d4c362..4891f32beeb 100644 --- a/services/test/moduletest/ipc_ability_mgr_test/BUILD.gn +++ b/services/test/moduletest/ipc_ability_mgr_test/BUILD.gn @@ -13,13 +13,16 @@ import("//build/test.gni") import("//foundation/aafwk/standard/aafwk.gni") +import("//foundation/aafwk/standard/feature.gni") module_output_path = "ability_runtime/mstabilitymgrservice" ohos_moduletest("IpcAbilityMgrServiceModuleTest") { module_out_path = module_output_path include_dirs = [ "//third_party/jsoncpp/include" ] - sources = [ "ipc_ability_mgr_module_test.cpp" ] + sources = [ + "ipc_ability_mgr_module_test.cpp", + ] configs = [ "${services_path}/test:aafwk_module_test_config", @@ -40,10 +43,13 @@ ohos_moduletest("IpcAbilityMgrServiceModuleTest") { "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//third_party/jsoncpp:jsoncpp", - "//third_party/libpng:libpng", "//utils/native/base:utils", ] + if (ability_runtime_graphics) { + deps += [ "//third_party/libpng:libpng" ] + } + external_deps = [ "bundle_framework:appexecfwk_core", "hiviewdfx_hilog_native:libhilog", @@ -54,5 +60,7 @@ ohos_moduletest("IpcAbilityMgrServiceModuleTest") { group("moduletest") { testonly = true - deps = [ ":IpcAbilityMgrServiceModuleTest" ] + deps = [ + ":IpcAbilityMgrServiceModuleTest", + ] } diff --git a/services/test/moduletest/ipc_ability_scheduler_test/BUILD.gn b/services/test/moduletest/ipc_ability_scheduler_test/BUILD.gn index df80d051f38..43f3c7b3b0b 100644 --- a/services/test/moduletest/ipc_ability_scheduler_test/BUILD.gn +++ b/services/test/moduletest/ipc_ability_scheduler_test/BUILD.gn @@ -13,6 +13,7 @@ import("//build/test.gni") import("//foundation/aafwk/standard/aafwk.gni") +import("//foundation/aafwk/standard/feature.gni") module_output_path = "ability_runtime/mstabilitymgrservice" @@ -56,10 +57,13 @@ ohos_moduletest("IpcAbilitySchedulerModuleTest") { "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//third_party/jsoncpp:jsoncpp", - "//third_party/libpng:libpng", "//utils/native/base:utilsbase", ] + if (ability_runtime_graphics) { + deps += [ "//third_party/libpng:libpng" ] + } + external_deps = [ "bundle_framework:appexecfwk_core", "hiviewdfx_hilog_native:libhilog", @@ -73,5 +77,7 @@ ohos_moduletest("IpcAbilitySchedulerModuleTest") { group("moduletest") { testonly = true - deps = [ ":IpcAbilitySchedulerModuleTest" ] + deps = [ + ":IpcAbilitySchedulerModuleTest", + ] } diff --git a/services/test/moduletest/panding_want_manager_test/BUILD.gn b/services/test/moduletest/panding_want_manager_test/BUILD.gn old mode 100755 new mode 100644 index ce1619d74a3..d4d3b7bb481 --- a/services/test/moduletest/panding_want_manager_test/BUILD.gn +++ b/services/test/moduletest/panding_want_manager_test/BUILD.gn @@ -14,6 +14,7 @@ import("//build/test.gni") import("//foundation/aafwk/standard/aafwk.gni") import("//foundation/aafwk/standard/services/abilitymgr/abilitymgr.gni") +import("//foundation/aafwk/standard/feature.gni") module_output_path = "ability_runtime/mstabilitymgrservice" @@ -52,7 +53,6 @@ ohos_moduletest("PandingWantMgrTest") { "${innerkits_path}/uri:zuri", "${innerkits_path}/uri_permission:uri_permission_mgr", "${innerkits_path}/want:want", - "${services_path}/common:perm_verification", "//base/account/os_account/frameworks/osaccount/native:os_account_innerkits", "//base/global/i18n_standard/frameworks/intl:intl_util", "//base/hiviewdfx/hiview/adapter/utility:hiview_adapter_utility", @@ -61,16 +61,13 @@ ohos_moduletest("PandingWantMgrTest") { "//foundation/aafwk/standard/frameworks/kits/appkit:app_context", "//foundation/aafwk/standard/frameworks/kits/wantagent:wantagent_innerkits", "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", - "//foundation/ace/ace_engine/interfaces/innerkits/ui_service_manager:ui_service_mgr", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", - "//foundation/graphic/standard:libwmservice", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//third_party/jsoncpp:jsoncpp", - "//third_party/libpng:libpng", "//utils/native/base:utils", ] @@ -86,11 +83,21 @@ ohos_moduletest("PandingWantMgrTest") { "hisysevent_native:libhisysevent", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", - "multimedia_image_standard:image_native", "native_appdatamgr:native_appdatafwk", "native_appdatamgr:native_dataability", "native_appdatamgr:native_rdb", ] + + if (ability_runtime_graphics) { + deps += [ + "${services_path}/common:perm_verification", + "//foundation/ace/ace_engine/interfaces/innerkits/ui_service_manager:ui_service_mgr", + "//foundation/graphic/standard:libwmservice", + "//third_party/libpng:libpng", + ] + + external_deps += [ "multimedia_image_standard:image_native" ] + } } group("moduletest") { diff --git a/test/resource/amssystemtestability/abilitySrc/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/BUILD.gn index 149d3a04e45..5e6f604c2be 100644 --- a/test/resource/amssystemtestability/abilitySrc/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/BUILD.gn @@ -15,7 +15,6 @@ group("ams_system_test_app") { deps = [ "amsAbilityAppendTestA:amsAbilityAppendTestA", "amsAbilityAppendTestB:amsAbilityAppendTestB", - "amsAbilityVisibleTestPageA:amsAbilityVisibleTestPageA", "amsAbilityVisibleTestServiceB:amsAbilityVisibleTestServiceB", "amsConfigurationUpdatedSingletonTest:amsConfigurationUpdatedSingletonTest", "amsConfigurationUpdatedTest:amsConfigurationUpdatedTest", @@ -29,7 +28,6 @@ group("ams_system_test_app") { "amsKitSystemTestB:amsKitSystemTestB", "amsKitSystemTestDataA:amsKitSystemTestDataA", "amsKitSystemTestDataB:amsKitSystemTestDataB", - "amsKitSystemTestPageA:amsKitSystemTestPageA", "amsKitSystemTestService:amsKitSystemTestService", "amsMissionStackTest:amsMissionStackTest", "amsMissionStackTestSubsidiary:amsMissionStackTestSubsidiary", @@ -67,4 +65,11 @@ group("ams_system_test_app") { # "launcherAbility:launcher_ability_native", ] + + if (ability_runtime_graphics) { + deps += [ + "amsAbilityVisibleTestPageA:amsAbilityVisibleTestPageA", + "amsKitSystemTestPageA:amsKitSystemTestPageA", + ] + } } diff --git a/test/systemtest/BUILD.gn b/test/systemtest/BUILD.gn index e6015affe0b..943a2db7944 100644 --- a/test/systemtest/BUILD.gn +++ b/test/systemtest/BUILD.gn @@ -24,7 +24,10 @@ group("systemtest") { deps = [ "common/ams:systemtest", - "common/fms:systemtest", "common/task_dispatcher:systemtest_task", ] + + if (ability_runtime_graphics) { + deps += [ "common/fms:systemtest" ] + } } diff --git a/test/systemtest/common/ams/BUILD.gn b/test/systemtest/common/ams/BUILD.gn old mode 100755 new mode 100644 index 950b5b9d137..012a22c7590 --- a/test/systemtest/common/ams/BUILD.gn +++ b/test/systemtest/common/ams/BUILD.gn @@ -42,9 +42,15 @@ group("systemtest") { "ams_dfx_test:systemtest", "ams_kit_test:systemtest", "ams_missionstack_test:systemtest", - "ams_page_ability_test:systemtest", - "ams_power_test:systemtest", "ams_service_ability_test:systemtest", "tool:system_test_ability_util", ] + + if (ability_runtime_graphics) { + deps += [ "ams_page_ability_test:systemtest" ] + } + + if (ability_runtime_power) { + deps += [ "ams_power_test:systemtest" ] + } } diff --git a/tools/BUILD.gn b/tools/BUILD.gn index 69b1afddf20..cacabd330b8 100644 --- a/tools/BUILD.gn +++ b/tools/BUILD.gn @@ -13,10 +13,14 @@ import("//build/ohos.gni") import("//foundation/aafwk/standard/aafwk.gni") +import("//foundation/aafwk/standard/feature.gni") group("tools_target") { deps = [ "aa:tools_aa", - "fm:tools_fm", ] + + if (ability_runtime_graphics) { + deps += [ "fm:tools_fm" ] + } } -- Gitee