From 0e072ee123bfd4743e62656f2edd20b673f76c7d Mon Sep 17 00:00:00 2001 From: wuliushuan Date: Tue, 3 Dec 2024 15:14:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=8C=E9=87=8D=E6=A3=80=E6=9F=A5=E9=94=81?= =?UTF-8?q?=E7=BA=BF=E7=A8=8B=E5=B9=B6=E5=8F=91=E9=97=AE=E9=A2=98=E5=A4=84?= =?UTF-8?q?=E7=90=8620241203?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wuliushuan Change-Id: I777967d040554f2a181c932730c74ea88dcee9bc --- .../unittest/app_manager_client/app_manager_access_client.cpp | 3 ++- .../innerkits/tokensync/src/token_sync_manager_client.cpp | 3 ++- .../main/cpp/src/callback/callback_manager.cpp | 3 ++- .../main/cpp/src/database/access_token_db.cpp | 3 ++- .../main/cpp/src/form_manager/form_manager_access_client.cpp | 3 ++- .../main/cpp/src/permission/dlp_permission_set_manager.cpp | 3 ++- .../main/cpp/src/permission/dlp_permission_set_parser.cpp | 3 ++- .../main/cpp/src/permission/permission_data_brief.cpp | 3 ++- .../main/cpp/src/permission/permission_definition_cache.cpp | 3 ++- .../main/cpp/src/permission/permission_definition_parser.cpp | 3 ++- .../main/cpp/src/permission/short_grant_manager.cpp | 3 ++- .../main/cpp/src/permission/temp_permission_observer.cpp | 3 ++- .../main/cpp/src/token/accesstoken_id_manager.cpp | 3 ++- .../main/cpp/src/token/accesstoken_info_manager.cpp | 3 ++- .../main/cpp/src/token/accesstoken_remote_token_manager.cpp | 3 ++- .../main/cpp/src/token/native_token_receptor.cpp | 3 ++- .../main/cpp/src/token/token_modify_notifier.cpp | 3 ++- services/common/app_manager/src/app_manager_access_client.cpp | 3 ++- .../src/background_task_manager_access_client.cpp | 3 ++- .../window_manager/src/privacy_window_manager_client.cpp | 3 ++- .../src/active/active_status_callback_manager.cpp | 3 ++- .../privacymanager/src/record/permission_record_manager.cpp | 3 ++- .../src/seccomp/privacy_sec_comp_enhance_agent.cpp | 3 ++- services/tokensyncmanager/src/device/device_info_manager.cpp | 3 ++- .../tokensyncmanager/src/device/device_info_repository.cpp | 3 ++- .../tokensyncmanager/src/remote/remote_command_factory.cpp | 3 ++- .../tokensyncmanager/src/remote/remote_command_manager.cpp | 3 ++- services/tokensyncmanager/src/remote/soft_bus_manager.cpp | 3 ++- 28 files changed, 56 insertions(+), 28 deletions(-) diff --git a/interfaces/innerkits/privacy/test/unittest/app_manager_client/app_manager_access_client.cpp b/interfaces/innerkits/privacy/test/unittest/app_manager_client/app_manager_access_client.cpp index b3d15a925..2aab421e6 100644 --- a/interfaces/innerkits/privacy/test/unittest/app_manager_client/app_manager_access_client.cpp +++ b/interfaces/innerkits/privacy/test/unittest/app_manager_client/app_manager_access_client.cpp @@ -35,7 +35,8 @@ AppManagerAccessClient& AppManagerAccessClient::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - instance = new AppManagerAccessClient(); + AppManagerAccessClient* tmp = new AppManagerAccessClient(); + instance = std::move(tmp); } } return *instance; diff --git a/interfaces/innerkits/tokensync/src/token_sync_manager_client.cpp b/interfaces/innerkits/tokensync/src/token_sync_manager_client.cpp index 1d1eeed07..bc7133304 100644 --- a/interfaces/innerkits/tokensync/src/token_sync_manager_client.cpp +++ b/interfaces/innerkits/tokensync/src/token_sync_manager_client.cpp @@ -34,7 +34,8 @@ TokenSyncManagerClient& TokenSyncManagerClient::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - instance = new TokenSyncManagerClient(); + TokenSyncManagerClient* tmp = new TokenSyncManagerClient(); + instance = std::move(tmp); } } return *instance; diff --git a/services/accesstokenmanager/main/cpp/src/callback/callback_manager.cpp b/services/accesstokenmanager/main/cpp/src/callback/callback_manager.cpp index 4de67687d..bdb2c10c1 100644 --- a/services/accesstokenmanager/main/cpp/src/callback/callback_manager.cpp +++ b/services/accesstokenmanager/main/cpp/src/callback/callback_manager.cpp @@ -43,7 +43,8 @@ CallbackManager& CallbackManager::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - instance = new CallbackManager(); + CallbackManager* tmp = new CallbackManager(); + instance = std::move(tmp); } } return *instance; diff --git a/services/accesstokenmanager/main/cpp/src/database/access_token_db.cpp b/services/accesstokenmanager/main/cpp/src/database/access_token_db.cpp index 3ec9e117a..9b89af5e4 100644 --- a/services/accesstokenmanager/main/cpp/src/database/access_token_db.cpp +++ b/services/accesstokenmanager/main/cpp/src/database/access_token_db.cpp @@ -43,7 +43,8 @@ AccessTokenDb& AccessTokenDb::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - instance = new AccessTokenDb(); + AccessTokenDb* tmp = new AccessTokenDb(); + instance = std::move(tmp); } } return *instance; diff --git a/services/accesstokenmanager/main/cpp/src/form_manager/form_manager_access_client.cpp b/services/accesstokenmanager/main/cpp/src/form_manager/form_manager_access_client.cpp index 715cacbbc..b3ba7baec 100644 --- a/services/accesstokenmanager/main/cpp/src/form_manager/form_manager_access_client.cpp +++ b/services/accesstokenmanager/main/cpp/src/form_manager/form_manager_access_client.cpp @@ -35,7 +35,8 @@ FormManagerAccessClient& FormManagerAccessClient::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - instance = new FormManagerAccessClient(); + FormManagerAccessClient* tmp = new FormManagerAccessClient(); + instance = std::move(tmp); } } return *instance; diff --git a/services/accesstokenmanager/main/cpp/src/permission/dlp_permission_set_manager.cpp b/services/accesstokenmanager/main/cpp/src/permission/dlp_permission_set_manager.cpp index 2efc2cc77..23796da98 100644 --- a/services/accesstokenmanager/main/cpp/src/permission/dlp_permission_set_manager.cpp +++ b/services/accesstokenmanager/main/cpp/src/permission/dlp_permission_set_manager.cpp @@ -37,7 +37,8 @@ DlpPermissionSetManager& DlpPermissionSetManager::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - instance = new DlpPermissionSetManager(); + DlpPermissionSetManager* tmp = new DlpPermissionSetManager(); + instance = std::move(tmp); } } return *instance; diff --git a/services/accesstokenmanager/main/cpp/src/permission/dlp_permission_set_parser.cpp b/services/accesstokenmanager/main/cpp/src/permission/dlp_permission_set_parser.cpp index 4752ecf38..90bb8f0bd 100644 --- a/services/accesstokenmanager/main/cpp/src/permission/dlp_permission_set_parser.cpp +++ b/services/accesstokenmanager/main/cpp/src/permission/dlp_permission_set_parser.cpp @@ -150,7 +150,8 @@ DlpPermissionSetParser& DlpPermissionSetParser::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - instance = new DlpPermissionSetParser(); + DlpPermissionSetParser* tmp = new DlpPermissionSetParser(); + instance = std::move(tmp); } } return *instance; diff --git a/services/accesstokenmanager/main/cpp/src/permission/permission_data_brief.cpp b/services/accesstokenmanager/main/cpp/src/permission/permission_data_brief.cpp index e8258efa6..32ad42a26 100644 --- a/services/accesstokenmanager/main/cpp/src/permission/permission_data_brief.cpp +++ b/services/accesstokenmanager/main/cpp/src/permission/permission_data_brief.cpp @@ -38,7 +38,8 @@ PermissionDataBrief& PermissionDataBrief::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_briefInstanceMutex); if (instance == nullptr) { - instance = new PermissionDataBrief(); + PermissionDataBrief* tmp = new PermissionDataBrief(); + instance = std::move(tmp); } } return *instance; diff --git a/services/accesstokenmanager/main/cpp/src/permission/permission_definition_cache.cpp b/services/accesstokenmanager/main/cpp/src/permission/permission_definition_cache.cpp index 0da324628..71d4315b6 100644 --- a/services/accesstokenmanager/main/cpp/src/permission/permission_definition_cache.cpp +++ b/services/accesstokenmanager/main/cpp/src/permission/permission_definition_cache.cpp @@ -38,7 +38,8 @@ PermissionDefinitionCache& PermissionDefinitionCache::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - instance = new PermissionDefinitionCache(); + PermissionDefinitionCache* tmp = new PermissionDefinitionCache(); + instance = std::move(tmp); } } return *instance; diff --git a/services/accesstokenmanager/main/cpp/src/permission/permission_definition_parser.cpp b/services/accesstokenmanager/main/cpp/src/permission/permission_definition_parser.cpp index b33ff436c..814af2e21 100644 --- a/services/accesstokenmanager/main/cpp/src/permission/permission_definition_parser.cpp +++ b/services/accesstokenmanager/main/cpp/src/permission/permission_definition_parser.cpp @@ -268,7 +268,8 @@ PermissionDefinitionParser& PermissionDefinitionParser::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - instance = new PermissionDefinitionParser(); + PermissionDefinitionParser* tmp = new PermissionDefinitionParser(); + instance = std::move(tmp); } } return *instance; diff --git a/services/accesstokenmanager/main/cpp/src/permission/short_grant_manager.cpp b/services/accesstokenmanager/main/cpp/src/permission/short_grant_manager.cpp index f3a2a3ef7..b6204f5de 100644 --- a/services/accesstokenmanager/main/cpp/src/permission/short_grant_manager.cpp +++ b/services/accesstokenmanager/main/cpp/src/permission/short_grant_manager.cpp @@ -42,7 +42,8 @@ ShortGrantManager& ShortGrantManager::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - instance = new ShortGrantManager(); + ShortGrantManager* tmp = new ShortGrantManager(); + instance = std::move(tmp); } } return *instance; diff --git a/services/accesstokenmanager/main/cpp/src/permission/temp_permission_observer.cpp b/services/accesstokenmanager/main/cpp/src/permission/temp_permission_observer.cpp index 25f86293d..3f62ade57 100644 --- a/services/accesstokenmanager/main/cpp/src/permission/temp_permission_observer.cpp +++ b/services/accesstokenmanager/main/cpp/src/permission/temp_permission_observer.cpp @@ -59,7 +59,8 @@ TempPermissionObserver& TempPermissionObserver::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - instance = new TempPermissionObserver(); + TempPermissionObserver* tmp = new TempPermissionObserver(); + instance = std::move(tmp); } } return *instance; diff --git a/services/accesstokenmanager/main/cpp/src/token/accesstoken_id_manager.cpp b/services/accesstokenmanager/main/cpp/src/token/accesstoken_id_manager.cpp index 74cd02e0f..74acedbf8 100644 --- a/services/accesstokenmanager/main/cpp/src/token/accesstoken_id_manager.cpp +++ b/services/accesstokenmanager/main/cpp/src/token/accesstoken_id_manager.cpp @@ -137,7 +137,8 @@ AccessTokenIDManager& AccessTokenIDManager::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - instance = new AccessTokenIDManager(); + AccessTokenIDManager* tmp = new AccessTokenIDManager(); + instance = std::move(tmp); } } return *instance; diff --git a/services/accesstokenmanager/main/cpp/src/token/accesstoken_info_manager.cpp b/services/accesstokenmanager/main/cpp/src/token/accesstoken_info_manager.cpp index e8e941b45..6e9398312 100644 --- a/services/accesstokenmanager/main/cpp/src/token/accesstoken_info_manager.cpp +++ b/services/accesstokenmanager/main/cpp/src/token/accesstoken_info_manager.cpp @@ -1021,7 +1021,8 @@ AccessTokenInfoManager& AccessTokenInfoManager::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - instance = new AccessTokenInfoManager(); + AccessTokenInfoManager* tmp = new AccessTokenInfoManager(); + instance = std::move(tmp); } } return *instance; diff --git a/services/accesstokenmanager/main/cpp/src/token/accesstoken_remote_token_manager.cpp b/services/accesstokenmanager/main/cpp/src/token/accesstoken_remote_token_manager.cpp index c72c418a7..4400f338b 100644 --- a/services/accesstokenmanager/main/cpp/src/token/accesstoken_remote_token_manager.cpp +++ b/services/accesstokenmanager/main/cpp/src/token/accesstoken_remote_token_manager.cpp @@ -41,7 +41,8 @@ AccessTokenRemoteTokenManager& AccessTokenRemoteTokenManager::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - instance = new AccessTokenRemoteTokenManager(); + AccessTokenRemoteTokenManager* tmp = new AccessTokenRemoteTokenManager(); + instance = std::move(tmp); } } return *instance; diff --git a/services/accesstokenmanager/main/cpp/src/token/native_token_receptor.cpp b/services/accesstokenmanager/main/cpp/src/token/native_token_receptor.cpp index 51132d7a8..14de978ae 100644 --- a/services/accesstokenmanager/main/cpp/src/token/native_token_receptor.cpp +++ b/services/accesstokenmanager/main/cpp/src/token/native_token_receptor.cpp @@ -183,7 +183,8 @@ NativeTokenReceptor& NativeTokenReceptor::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - instance = new NativeTokenReceptor(); + NativeTokenReceptor* tmp = new NativeTokenReceptor(); + instance = std::move(tmp); } } return *instance; diff --git a/services/accesstokenmanager/main/cpp/src/token/token_modify_notifier.cpp b/services/accesstokenmanager/main/cpp/src/token/token_modify_notifier.cpp index bf9ad06e5..612db78c1 100644 --- a/services/accesstokenmanager/main/cpp/src/token/token_modify_notifier.cpp +++ b/services/accesstokenmanager/main/cpp/src/token/token_modify_notifier.cpp @@ -91,7 +91,8 @@ TokenModifyNotifier& TokenModifyNotifier::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - instance = new TokenModifyNotifier(); + TokenModifyNotifier* tmp = new TokenModifyNotifier(); + instance = std::move(tmp); } } diff --git a/services/common/app_manager/src/app_manager_access_client.cpp b/services/common/app_manager/src/app_manager_access_client.cpp index 4d7c1eedb..000c03153 100644 --- a/services/common/app_manager/src/app_manager_access_client.cpp +++ b/services/common/app_manager/src/app_manager_access_client.cpp @@ -35,7 +35,8 @@ AppManagerAccessClient& AppManagerAccessClient::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - instance = new AppManagerAccessClient(); + AppManagerAccessClient* tmp = new AppManagerAccessClient(); + instance = std::move(tmp); } } return *instance; diff --git a/services/common/background_task_manager/src/background_task_manager_access_client.cpp b/services/common/background_task_manager/src/background_task_manager_access_client.cpp index 552672899..4307b3c4d 100644 --- a/services/common/background_task_manager/src/background_task_manager_access_client.cpp +++ b/services/common/background_task_manager/src/background_task_manager_access_client.cpp @@ -35,7 +35,8 @@ BackgourndTaskManagerAccessClient& BackgourndTaskManagerAccessClient::GetInstanc if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - instance = new BackgourndTaskManagerAccessClient(); + BackgourndTaskManagerAccessClient* tmp = new BackgourndTaskManagerAccessClient(); + instance = std::move(tmp); } } return *instance; diff --git a/services/common/window_manager/src/privacy_window_manager_client.cpp b/services/common/window_manager/src/privacy_window_manager_client.cpp index 2b07a1554..f7e2a59e7 100644 --- a/services/common/window_manager/src/privacy_window_manager_client.cpp +++ b/services/common/window_manager/src/privacy_window_manager_client.cpp @@ -44,7 +44,8 @@ PrivacyWindowManagerClient& PrivacyWindowManagerClient::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - instance = new PrivacyWindowManagerClient(); + PrivacyWindowManagerClient* tmp = new PrivacyWindowManagerClient(); + instance = std::move(tmp); } } return *instance; diff --git a/services/privacymanager/src/active/active_status_callback_manager.cpp b/services/privacymanager/src/active/active_status_callback_manager.cpp index 35c265f89..7320b6c46 100644 --- a/services/privacymanager/src/active/active_status_callback_manager.cpp +++ b/services/privacymanager/src/active/active_status_callback_manager.cpp @@ -41,7 +41,8 @@ ActiveStatusCallbackManager& ActiveStatusCallbackManager::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - instance = new ActiveStatusCallbackManager(); + ActiveStatusCallbackManager* tmp = new ActiveStatusCallbackManager(); + instance = std::move(tmp); } } return *instance; diff --git a/services/privacymanager/src/record/permission_record_manager.cpp b/services/privacymanager/src/record/permission_record_manager.cpp index ca0d52880..95a09ecf1 100644 --- a/services/privacymanager/src/record/permission_record_manager.cpp +++ b/services/privacymanager/src/record/permission_record_manager.cpp @@ -84,7 +84,8 @@ PermissionRecordManager& PermissionRecordManager::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - instance = new PermissionRecordManager(); + PermissionRecordManager* tmp = new PermissionRecordManager(); + instance = std::move(tmp); } } return *instance; diff --git a/services/privacymanager/src/seccomp/privacy_sec_comp_enhance_agent.cpp b/services/privacymanager/src/seccomp/privacy_sec_comp_enhance_agent.cpp index 7c5ccc12b..9faaa1a8c 100644 --- a/services/privacymanager/src/seccomp/privacy_sec_comp_enhance_agent.cpp +++ b/services/privacymanager/src/seccomp/privacy_sec_comp_enhance_agent.cpp @@ -50,7 +50,8 @@ PrivacySecCompEnhanceAgent& PrivacySecCompEnhanceAgent::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - instance = new PrivacySecCompEnhanceAgent(); + PrivacySecCompEnhanceAgent* tmp = new PrivacySecCompEnhanceAgent(); + instance = std::move(tmp); } } return *instance; diff --git a/services/tokensyncmanager/src/device/device_info_manager.cpp b/services/tokensyncmanager/src/device/device_info_manager.cpp index 2e98f0bba..f8783d040 100644 --- a/services/tokensyncmanager/src/device/device_info_manager.cpp +++ b/services/tokensyncmanager/src/device/device_info_manager.cpp @@ -29,7 +29,8 @@ DeviceInfoManager &DeviceInfoManager::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - instance = new DeviceInfoManager(); + DeviceInfoManager* tmp = new DeviceInfoManager(); + instance = std::move(tmp); } } return *instance; diff --git a/services/tokensyncmanager/src/device/device_info_repository.cpp b/services/tokensyncmanager/src/device/device_info_repository.cpp index 932e69144..e90690b03 100644 --- a/services/tokensyncmanager/src/device/device_info_repository.cpp +++ b/services/tokensyncmanager/src/device/device_info_repository.cpp @@ -27,7 +27,8 @@ DeviceInfoRepository &DeviceInfoRepository::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - instance = new DeviceInfoRepository(); + DeviceInfoRepository* tmp = new DeviceInfoRepository(); + instance = std::move(tmp); } } return *instance; diff --git a/services/tokensyncmanager/src/remote/remote_command_factory.cpp b/services/tokensyncmanager/src/remote/remote_command_factory.cpp index 67db3cc0f..88ecff124 100644 --- a/services/tokensyncmanager/src/remote/remote_command_factory.cpp +++ b/services/tokensyncmanager/src/remote/remote_command_factory.cpp @@ -30,7 +30,8 @@ RemoteCommandFactory &RemoteCommandFactory::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - instance = new RemoteCommandFactory(); + RemoteCommandFactory* tmp = new RemoteCommandFactory(); + instance = std::move(tmp); } } return *instance; diff --git a/services/tokensyncmanager/src/remote/remote_command_manager.cpp b/services/tokensyncmanager/src/remote/remote_command_manager.cpp index 8d0c6588b..98c77f07e 100644 --- a/services/tokensyncmanager/src/remote/remote_command_manager.cpp +++ b/services/tokensyncmanager/src/remote/remote_command_manager.cpp @@ -47,7 +47,8 @@ RemoteCommandManager &RemoteCommandManager::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - instance = new RemoteCommandManager(); + RemoteCommandManager* tmp = new RemoteCommandManager(); + instance = std::move(tmp); } } return *instance; diff --git a/services/tokensyncmanager/src/remote/soft_bus_manager.cpp b/services/tokensyncmanager/src/remote/soft_bus_manager.cpp index 86e1d0828..512e1a56d 100644 --- a/services/tokensyncmanager/src/remote/soft_bus_manager.cpp +++ b/services/tokensyncmanager/src/remote/soft_bus_manager.cpp @@ -76,7 +76,8 @@ SoftBusManager &SoftBusManager::GetInstance() if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - instance = new SoftBusManager(); + SoftBusManager* tmp = new SoftBusManager(); + instance = std::move(tmp); } } return *instance; -- Gitee