From 10885180d06f493d29a7c5032d127b96760c8285 Mon Sep 17 00:00:00 2001 From: bigtea Date: Mon, 14 Jul 2025 11:17:15 +0800 Subject: [PATCH] Add isModalRequestFocus Signed-off-by: bigtea --- frameworks/ets/ani/accesstoken/src/ability_access_ctrl.cpp | 1 + .../accesstoken/src/napi_request_global_switch_on_setting.cpp | 1 + frameworks/js/napi/accesstoken/src/napi_request_permission.cpp | 1 + .../napi/accesstoken/src/napi_request_permission_on_setting.cpp | 1 + 4 files changed, 4 insertions(+) diff --git a/frameworks/ets/ani/accesstoken/src/ability_access_ctrl.cpp b/frameworks/ets/ani/accesstoken/src/ability_access_ctrl.cpp index 9b8ca465f..267609a31 100644 --- a/frameworks/ets/ani/accesstoken/src/ability_access_ctrl.cpp +++ b/frameworks/ets/ani/accesstoken/src/ability_access_ctrl.cpp @@ -138,6 +138,7 @@ static void CreateUIExtensionMainThread(std::shared_ptr& as OHOS::Ace::ModalUIExtensionConfig config; config.isProhibitBack = true; + config.isModalRequestFocus = false; int32_t sessionId = uiContent->CreateModalUIExtension(want, uiExtensionCallbacks, config); if (sessionId == 0) { ACCESSTOKEN_LOG_ERROR(LABEL, "Create component failed, sessionId is 0"); diff --git a/frameworks/js/napi/accesstoken/src/napi_request_global_switch_on_setting.cpp b/frameworks/js/napi/accesstoken/src/napi_request_global_switch_on_setting.cpp index 981c13fb2..562cd5289 100644 --- a/frameworks/js/napi/accesstoken/src/napi_request_global_switch_on_setting.cpp +++ b/frameworks/js/napi/accesstoken/src/napi_request_global_switch_on_setting.cpp @@ -295,6 +295,7 @@ static void CreateUIExtensionMainThread(std::shared_ptrCreateModalUIExtension(want, uiExtensionCallbacks, config); LOGI(ATM_DOMAIN, ATM_TAG, "Create end, sessionId: %{public}d, tokenId: %{public}d, switchType: %{public}d.", sessionId, asyncContext->tokenId, asyncContext->switchType); diff --git a/frameworks/js/napi/accesstoken/src/napi_request_permission.cpp b/frameworks/js/napi/accesstoken/src/napi_request_permission.cpp index 19a978370..f20ff3250 100644 --- a/frameworks/js/napi/accesstoken/src/napi_request_permission.cpp +++ b/frameworks/js/napi/accesstoken/src/napi_request_permission.cpp @@ -140,6 +140,7 @@ static void CreateUIExtensionMainThread(std::shared_ptr& as Ace::ModalUIExtensionConfig config; config.isProhibitBack = true; + config.isModalRequestFocus = false; int32_t sessionId = uiContent->CreateModalUIExtension(want, uiExtensionCallbacks, config); LOGI(ATM_DOMAIN, ATM_TAG, "Create end, sessionId: %{public}d, tokenId: %{public}d, permNum: %{public}zu", diff --git a/frameworks/js/napi/accesstoken/src/napi_request_permission_on_setting.cpp b/frameworks/js/napi/accesstoken/src/napi_request_permission_on_setting.cpp index ed7f3282c..6f298656b 100644 --- a/frameworks/js/napi/accesstoken/src/napi_request_permission_on_setting.cpp +++ b/frameworks/js/napi/accesstoken/src/napi_request_permission_on_setting.cpp @@ -324,6 +324,7 @@ static void CreateUIExtensionMainThread(std::shared_ptrCreateModalUIExtension(want, uiExtensionCallbacks, config); LOGI(ATM_DOMAIN, ATM_TAG, "Create end, sessionId: %{public}d, tokenId: %{public}d.", sessionId, asyncContext->tokenId); -- Gitee