From 28d756c289c617bf96a38572aaea049fca043388 Mon Sep 17 00:00:00 2001 From: Haryslee Date: Sat, 20 Jul 2024 11:49:19 +0800 Subject: [PATCH] fix: for the bug of security component Signed-off-by: Haryslee Change-Id: Ia8899664273a79c26684f167a9b5bb40cb37fd3b --- .../sa/sa_main/sec_comp_manager.cpp | 4 +++- .../sa/sa_main/sec_comp_perm_manager.cpp | 3 +-- .../sa/sa_main/sec_comp_perm_manager.h | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/services/security_component_service/sa/sa_main/sec_comp_manager.cpp b/services/security_component_service/sa/sa_main/sec_comp_manager.cpp index 6dc4bfd..f493ccc 100644 --- a/services/security_component_service/sa/sa_main/sec_comp_manager.cpp +++ b/services/security_component_service/sa/sa_main/sec_comp_manager.cpp @@ -555,8 +555,10 @@ bool SecCompManager::Initialize() DelayExitTask::GetInstance().Init(secHandler_); FirstUseDialog::GetInstance().Init(secHandler_); SecCompEnhanceAdapter::EnableInputEnhance(); + SecCompPermManager::GetInstance().InitEventHandler(secHandler_); + DelayExitTask::GetInstance().Start(); - return SecCompPermManager::GetInstance().InitEventHandler(secHandler_); + return true; } } // namespace SecurityComponent } // namespace Security diff --git a/services/security_component_service/sa/sa_main/sec_comp_perm_manager.cpp b/services/security_component_service/sa/sa_main/sec_comp_perm_manager.cpp index 02b1594..187cd42 100644 --- a/services/security_component_service/sa/sa_main/sec_comp_perm_manager.cpp +++ b/services/security_component_service/sa/sa_main/sec_comp_perm_manager.cpp @@ -256,10 +256,9 @@ void SecCompPermManager::CancelAppRevokingPermisions(AccessToken::AccessTokenID secHandler_->ProxyRemoveTask(taskName); } -bool SecCompPermManager::InitEventHandler(const std::shared_ptr& secHandler) +void SecCompPermManager::InitEventHandler(const std::shared_ptr& secHandler) { secHandler_ = secHandler; - return true; } } // namespace SecurityComponent } // namespace Security diff --git a/services/security_component_service/sa/sa_main/sec_comp_perm_manager.h b/services/security_component_service/sa/sa_main/sec_comp_perm_manager.h index a5b8ab5..b157e78 100644 --- a/services/security_component_service/sa/sa_main/sec_comp_perm_manager.h +++ b/services/security_component_service/sa/sa_main/sec_comp_perm_manager.h @@ -41,7 +41,7 @@ public: int32_t RevokeAppPermission(AccessToken::AccessTokenID tokenId, const std::string& permissionName); void RevokeAppPermissions(AccessToken::AccessTokenID tokenId); - bool InitEventHandler(const std::shared_ptr& secHandler); + void InitEventHandler(const std::shared_ptr& secHandler); std::shared_ptr GetSecEventHandler() const; void RevokeAppPermisionsDelayed(AccessToken::AccessTokenID tokenId);