From 5201571cbc556a096e4151e97093eb86aa3d5be2 Mon Sep 17 00:00:00 2001 From: yuqianyuan Date: Wed, 8 Sep 2021 17:19:13 +0800 Subject: [PATCH 1/2] support devicemanager Signed-off-by: yuqianyuan --- frameworks/kits/ability/native/src/ability.cpp | 6 ++++++ services/abilitymgr/include/ability_config.h | 3 +++ services/abilitymgr/include/ability_util.h | 9 ++++++++- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/frameworks/kits/ability/native/src/ability.cpp b/frameworks/kits/ability/native/src/ability.cpp index 8a0555cac7a..ca2256d4d55 100644 --- a/frameworks/kits/ability/native/src/ability.cpp +++ b/frameworks/kits/ability/native/src/ability.cpp @@ -28,6 +28,8 @@ REGISTER_AA(Ability) const std::string Ability::SYSTEM_UI("com.ohos.systemui"); const std::string Ability::STATUS_BAR("com.ohos.systemui.statusbar.MainAbility"); const std::string Ability::NAVIGATION_BAR("com.ohos.systemui.navigationbar.MainAbility"); +const std::string DEVICE_MANAGER_BUNDLE_NAME = "com.ohos.devicemanagerui"; +const std::string DEVICE_MANAGER_NAME = "com.ohos.devicemanagerui.MainAbility"; void Ability::Init(const std::shared_ptr &abilityInfo, const std::shared_ptr &application, std::shared_ptr &handler, const sptr &token) @@ -96,6 +98,10 @@ void Ability::OnStart(const Want &want) abilityInfo_->name == OHOS_REQUEST_PERMISSION_ABILITY_NAME) { config.type = OHOS::WindowType::WINDOW_TYPE_ALARM_SCREEN; } + if (abilityInfo_->bundleName == DEVICE_MANAGER_BUNDLE_NAME && + abilityInfo_->name == DEVICE_MANAGER_NAME) { + config.type = OHOS::WindowType::WINDOW_TYPE_ALARM_SCREEN; + } APP_LOGI("Ability::OnStart bundleName:%{public}s abilityName:%{public}s: set config.type = %{public}d", abilityInfo_->bundleName.c_str(), abilityInfo_->name.c_str(), diff --git a/services/abilitymgr/include/ability_config.h b/services/abilitymgr/include/ability_config.h index a69b8cf083e..63b5d544732 100644 --- a/services/abilitymgr/include/ability_config.h +++ b/services/abilitymgr/include/ability_config.h @@ -29,6 +29,9 @@ const std::string SYSTEM_UI_STATUS_BAR = "com.ohos.systemui.statusbar.MainAbilit const std::string SYSTEM_UI_NAVIGATION_BAR = "com.ohos.systemui.navigationbar.MainAbility"; const std::string SYSTEM_DIALOG_NAME = "com.ohos.systemui.systemdialog.MainAbility"; +const std::string DEVICE_MANAGER_BUNDLE_NAME = "com.ohos.devicemanagerui"; +const std::string DEVICE_MANAGER_NAME = "com.ohos.devicemanagerui.MainAbility"; + const std::string SYSTEM_DIALOG_REQUEST_PERMISSIONS = "OHOS_RESULT_PERMISSIONS_LIST_YES"; const std::string SYSTEM_DIALOG_CALLER_BUNDLENAME = "OHOS_RESULT_CALLER_BUNDLERNAME"; const std::string SYSTEM_DIALOG_KEY = "OHOS_RESULT_PERMISSION_KEY"; diff --git a/services/abilitymgr/include/ability_util.h b/services/abilitymgr/include/ability_util.h index 067adc9b3cc..20dc60aed8d 100644 --- a/services/abilitymgr/include/ability_util.h +++ b/services/abilitymgr/include/ability_util.h @@ -49,7 +49,14 @@ namespace AbilitUtil { [[maybe_unused]] static bool IsSystemDialogAbility(const std::string &bundleName, const std::string &abilityName) { - return (abilityName == AbilityConfig::SYSTEM_DIALOG_NAME) && (bundleName == AbilityConfig::SYSTEM_UI_BUNDLE_NAME); + if (abilityName == AbilityConfig::SYSTEM_DIALOG_NAME && bundleName == AbilityConfig::SYSTEM_UI_BUNDLE_NAME) { + return true; + } + if(abilityName == AbilityConfig::DEVICE_MANAGER_NAME && bundleName == AbilityConfig::DEVICE_MANAGER_BUNDLE_NAME){ + return true; + } + + return false; } } // namespace AbilitUtil } // namespace AAFwk -- Gitee From 6c3dcdd9f780a3805227e4b6ab3a75b7d51ed0f0 Mon Sep 17 00:00:00 2001 From: yuqianyuan Date: Thu, 9 Sep 2021 09:19:15 +0800 Subject: [PATCH 2/2] to support devicemanager Signed-off-by: yuqianyuan --- frameworks/kits/ability/native/src/ability.cpp | 1 - services/abilitymgr/include/ability_util.h | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/frameworks/kits/ability/native/src/ability.cpp b/frameworks/kits/ability/native/src/ability.cpp index ca2256d4d55..8f101ce65a9 100644 --- a/frameworks/kits/ability/native/src/ability.cpp +++ b/frameworks/kits/ability/native/src/ability.cpp @@ -1302,6 +1302,5 @@ void Ability::TerminateAndRemoveMission() } AbilityContext::TerminateAndRemoveMission(); } - } // namespace AppExecFwk } // namespace OHOS diff --git a/services/abilitymgr/include/ability_util.h b/services/abilitymgr/include/ability_util.h index 20dc60aed8d..c6af3ec8402 100644 --- a/services/abilitymgr/include/ability_util.h +++ b/services/abilitymgr/include/ability_util.h @@ -52,7 +52,7 @@ namespace AbilitUtil { if (abilityName == AbilityConfig::SYSTEM_DIALOG_NAME && bundleName == AbilityConfig::SYSTEM_UI_BUNDLE_NAME) { return true; } - if(abilityName == AbilityConfig::DEVICE_MANAGER_NAME && bundleName == AbilityConfig::DEVICE_MANAGER_BUNDLE_NAME){ + if (abilityName == AbilityConfig::DEVICE_MANAGER_NAME && bundleName == AbilityConfig::DEVICE_MANAGER_BUNDLE_NAME) { return true; } -- Gitee