From 888f418cf71d9c16322306a50f3f0fb5dbcfa93a Mon Sep 17 00:00:00 2001 From: pengguanqi Date: Sat, 11 Sep 2021 15:40:12 +0800 Subject: [PATCH 1/2] add devicemanagerui SystemDialogAbility Signed-off-by: pengguanqi --- frameworks/kits/ability/native/src/ability.cpp | 7 +++++++ services/abilitymgr/include/ability_config.h | 3 +++ services/abilitymgr/include/ability_util.h | 9 ++++++++- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/frameworks/kits/ability/native/src/ability.cpp b/frameworks/kits/ability/native/src/ability.cpp index ba9977f6e94..ae3d6b23de2 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) @@ -89,6 +91,11 @@ void Ability::OnStart(const Want &want) winType = OHOS::WindowType::WINDOW_TYPE_ALARM_SCREEN; } + if (abilityInfo_->bundleName == DEVICE_MANAGER_BUNDLE_NAME && + abilityInfo_->name == DEVICE_MANAGER_NAME) { + winType = OHOS::WindowType::WINDOW_TYPE_ALARM_SCREEN; + } + config->SetWindowType(winType); APP_LOGI("Ability::OnStart bundleName:%{public}s abilityName:%{public}s: set config.type = %{public}d", abilityInfo_->bundleName.c_str(), diff --git a/services/abilitymgr/include/ability_config.h b/services/abilitymgr/include/ability_config.h index a69b8cf083e..469cee3ae09 100644 --- a/services/abilitymgr/include/ability_config.h +++ b/services/abilitymgr/include/ability_config.h @@ -32,6 +32,9 @@ const std::string SYSTEM_DIALOG_NAME = "com.ohos.systemui.systemdialog.MainAbili 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"; + +const std::string DEVICE_MANAGER_BUNDLE_NAME = "com.ohos.devicemanagerui"; +const std::string DEVICE_MANAGER_NAME = "com.ohos.devicemanagerui.MainAbility"; } // namespace AbilityConfig } // namespace AAFwk } // namespace OHOS 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 b5e057e19a67c7099ebcf787729601e1368c5d00 Mon Sep 17 00:00:00 2001 From: pengguanqi Date: Sat, 11 Sep 2021 16:42:05 +0800 Subject: [PATCH 2/2] add devicemanagerui SystemDialogAbility Signed-off-by: pengguanqi --- services/abilitymgr/include/ability_util.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/services/abilitymgr/include/ability_util.h b/services/abilitymgr/include/ability_util.h index 20dc60aed8d..156358bc88e 100644 --- a/services/abilitymgr/include/ability_util.h +++ b/services/abilitymgr/include/ability_util.h @@ -52,7 +52,8 @@ 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