From befe8cd2cf78fc356b86b4b9bba754ade3286eaf Mon Sep 17 00:00:00 2001 From: baoyang Date: Fri, 15 Nov 2024 01:46:56 +0000 Subject: [PATCH] cherry pick b0bf18c from https://gitee.com/bao_yang_300/security_security_component/pulls/216 add uid into want Signed-off-by: baoyang Change-Id: If8b6d67165cbeef8a43a0bd417e5c6221709d108 --- .../sa/sa_main/first_use_dialog.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/services/security_component_service/sa/sa_main/first_use_dialog.cpp b/services/security_component_service/sa/sa_main/first_use_dialog.cpp index 8fd4cd1..f5bc9e1 100644 --- a/services/security_component_service/sa/sa_main/first_use_dialog.cpp +++ b/services/security_component_service/sa/sa_main/first_use_dialog.cpp @@ -23,6 +23,7 @@ #include "accesstoken_kit.h" #include "bundle_mgr_client.h" #include "hisysevent.h" +#include "ipc_skeleton.h" #include "sec_comp_dialog_callback_proxy.h" #include "sec_comp_err.h" #include "sec_comp_log.h" @@ -45,6 +46,7 @@ const std::string GRANT_ABILITY_ABILITY_NAME = "com.ohos.permissionmanager.Secur const std::string TYPE_KEY = "ohos.user.security.type"; const std::string TOKEN_KEY = "ohos.ability.params.token"; const std::string CALLBACK_KEY = "ohos.ability.params.callback"; +const std::string CALLER_UID_KEY = "ohos.caller.uid"; constexpr uint32_t MAX_CFG_FILE_SIZE = 100 * 1024; // 100k constexpr uint64_t LOCATION_BUTTON_FIRST_USE = 1 << 0; @@ -312,6 +314,8 @@ void FirstUseDialog::StartDialogAbility(std::shared_ptr entity, want.SetParam(TYPE_KEY, typeNum); want.SetParam(TOKEN_KEY, callerToken); want.SetParam(CALLBACK_KEY, srvCallback); + int32_t uid = IPCSkeleton::GetCallingUid(); + want.SetParam(CALLER_UID_KEY, uid); int startRes = AAFwk::AbilityManagerClient::GetInstance()->StartExtensionAbility(want, callerToken); SC_LOG_INFO(LABEL, "start ability res %{public}d", startRes); if (startRes != 0) { -- Gitee