From 02fada182598e5eff4f85e437bd8d751927ca4a2 Mon Sep 17 00:00:00 2001 From: bigtea Date: Wed, 11 Jun 2025 17:23:58 +0800 Subject: [PATCH] Fix Alert Signed-off-by: bigtea --- .../permission/temp_permission_observer.cpp | 6 ++--- .../test/unittest/permission_manager_test.cpp | 6 ++--- .../background_task_manager_access_client.h | 10 ++++---- .../background_task_manager_access_client.cpp | 24 +++++++++---------- ...ackground_task_manager_death_recipient.cpp | 2 +- .../src/record/permission_record_manager.cpp | 24 +++++++------------ .../token_sync_service_coverage_test.cpp | 3 +++ 7 files changed, 35 insertions(+), 40 deletions(-) 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 bcce7368d..6d72bf940 100644 --- a/services/accesstokenmanager/main/cpp/src/permission/temp_permission_observer.cpp +++ b/services/accesstokenmanager/main/cpp/src/permission/temp_permission_observer.cpp @@ -237,7 +237,7 @@ void TempPermissionObserver::RegisterCallback() LOGE(ATM_DOMAIN, ATM_TAG, "Register backgroundTaskCallback failed."); return; } - int ret = BackgourndTaskManagerAccessClient::GetInstance().SubscribeBackgroundTask(backgroundTaskCallback_); + int ret = BackgroundTaskManagerAccessClient::GetInstance().SubscribeBackgroundTask(backgroundTaskCallback_); LOGI(ATM_DOMAIN, ATM_TAG, "Register backgroundTaskCallback %{public}d.", ret); } } @@ -319,7 +319,7 @@ void TempPermissionObserver::UnRegisterCallback() { std::lock_guard lock(backgroundTaskCallbackMutex_); if (backgroundTaskCallback_ != nullptr) { - int32_t ret = BackgourndTaskManagerAccessClient::GetInstance().UnsubscribeBackgroundTask( + int32_t ret = BackgroundTaskManagerAccessClient::GetInstance().UnsubscribeBackgroundTask( backgroundTaskCallback_); if (ret != ERR_NONE) { LOGI(ATM_DOMAIN, ATM_TAG, "Unregister appStateCallback %{public}d.", ret); @@ -453,7 +453,7 @@ bool TempPermissionObserver::CheckPermissionState(AccessTokenID tokenID, bool isContinuousTaskExist = false; #ifdef BGTASKMGR_CONTINUOUS_TASK_ENABLE std::vector> continuousTaskList; - BackgourndTaskManagerAccessClient::GetInstance().GetContinuousTaskApps(continuousTaskList); + BackgroundTaskManagerAccessClient::GetInstance().GetContinuousTaskApps(continuousTaskList); for (auto iter = continuousTaskList.begin(); iter != continuousTaskList.end(); iter++) { if (static_cast((*iter)->tokenId_) == tokenID) { if (std::any_of((*iter)->typeIds_.begin(), (*iter)->typeIds_.end(), diff --git a/services/accesstokenmanager/test/unittest/permission_manager_test.cpp b/services/accesstokenmanager/test/unittest/permission_manager_test.cpp index 61f11d53b..8f6886d51 100644 --- a/services/accesstokenmanager/test/unittest/permission_manager_test.cpp +++ b/services/accesstokenmanager/test/unittest/permission_manager_test.cpp @@ -1759,11 +1759,11 @@ HWTEST_F(PermissionManagerTest, ContinuousTaskCallbackCall001, TestSize.Level1) sptr backgroundTaskObserver = new (std::nothrow) PermissionBackgroundTaskObserver(); ASSERT_EQ(RET_SUCCESS, - BackgourndTaskManagerAccessClient::GetInstance().SubscribeBackgroundTask(backgroundTaskObserver)); + BackgroundTaskManagerAccessClient::GetInstance().SubscribeBackgroundTask(backgroundTaskObserver)); ASSERT_EQ(RET_SUCCESS, - BackgourndTaskManagerAccessClient::GetInstance().UnsubscribeBackgroundTask(backgroundTaskObserver)); + BackgroundTaskManagerAccessClient::GetInstance().UnsubscribeBackgroundTask(backgroundTaskObserver)); std::vector> list; - ASSERT_EQ(RET_SUCCESS, BackgourndTaskManagerAccessClient::GetInstance().GetContinuousTaskApps(list)); + ASSERT_EQ(RET_SUCCESS, BackgroundTaskManagerAccessClient::GetInstance().GetContinuousTaskApps(list)); } #endif } // namespace AccessToken diff --git a/services/common/background_task_manager/include/background_task_manager_access_client.h b/services/common/background_task_manager/include/background_task_manager_access_client.h index 53e2116e8..426df1537 100644 --- a/services/common/background_task_manager/include/background_task_manager_access_client.h +++ b/services/common/background_task_manager/include/background_task_manager_access_client.h @@ -27,10 +27,10 @@ namespace OHOS { namespace Security { namespace AccessToken { -class BackgourndTaskManagerAccessClient final { +class BackgroundTaskManagerAccessClient final { public: - static BackgourndTaskManagerAccessClient& GetInstance(); - virtual ~BackgourndTaskManagerAccessClient(); + static BackgroundTaskManagerAccessClient& GetInstance(); + virtual ~BackgroundTaskManagerAccessClient(); int32_t SubscribeBackgroundTask(const sptr& subscriber); int32_t UnsubscribeBackgroundTask(const sptr& subscriber); @@ -38,8 +38,8 @@ public: void OnRemoteDiedHandle(); private: - BackgourndTaskManagerAccessClient(); - DISALLOW_COPY_AND_MOVE(BackgourndTaskManagerAccessClient); + BackgroundTaskManagerAccessClient(); + DISALLOW_COPY_AND_MOVE(BackgroundTaskManagerAccessClient); void InitProxy(); sptr GetProxy(); 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 7ae32486c..28a19d705 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 @@ -26,29 +26,29 @@ static constexpr int32_t ERROR = -1; std::recursive_mutex g_instanceMutex; } // namespace -BackgourndTaskManagerAccessClient& BackgourndTaskManagerAccessClient::GetInstance() +BackgroundTaskManagerAccessClient& BackgroundTaskManagerAccessClient::GetInstance() { - static BackgourndTaskManagerAccessClient* instance = nullptr; + static BackgroundTaskManagerAccessClient* instance = nullptr; if (instance == nullptr) { std::lock_guard lock(g_instanceMutex); if (instance == nullptr) { - BackgourndTaskManagerAccessClient* tmp = new BackgourndTaskManagerAccessClient(); + BackgroundTaskManagerAccessClient* tmp = new (std::nothrow) BackgroundTaskManagerAccessClient(); instance = std::move(tmp); } } return *instance; } -BackgourndTaskManagerAccessClient::BackgourndTaskManagerAccessClient() +BackgroundTaskManagerAccessClient::BackgroundTaskManagerAccessClient() {} -BackgourndTaskManagerAccessClient::~BackgourndTaskManagerAccessClient() +BackgroundTaskManagerAccessClient::~BackgroundTaskManagerAccessClient() { std::lock_guard lock(proxyMutex_); ReleaseProxy(); } -int32_t BackgourndTaskManagerAccessClient::SubscribeBackgroundTask(const sptr& subscriber) +int32_t BackgroundTaskManagerAccessClient::SubscribeBackgroundTask(const sptr& subscriber) { if (subscriber == nullptr) { LOGE(ATM_DOMAIN, ATM_TAG, "Callback is nullptr."); @@ -62,7 +62,7 @@ int32_t BackgourndTaskManagerAccessClient::SubscribeBackgroundTask(const sptrSubscribeBackgroundTask(subscriber); } -int32_t BackgourndTaskManagerAccessClient::UnsubscribeBackgroundTask(const sptr& subscriber) +int32_t BackgroundTaskManagerAccessClient::UnsubscribeBackgroundTask(const sptr& subscriber) { if (subscriber == nullptr) { LOGE(ATM_DOMAIN, ATM_TAG, "Callback is nullptr."); @@ -76,7 +76,7 @@ int32_t BackgourndTaskManagerAccessClient::UnsubscribeBackgroundTask(const sptr< return proxy->UnsubscribeBackgroundTask(subscriber); } -int32_t BackgourndTaskManagerAccessClient::GetContinuousTaskApps( +int32_t BackgroundTaskManagerAccessClient::GetContinuousTaskApps( std::vector> &list) { auto proxy = GetProxy(); @@ -87,7 +87,7 @@ int32_t BackgourndTaskManagerAccessClient::GetContinuousTaskApps( return proxy->GetContinuousTaskApps(list); } -void BackgourndTaskManagerAccessClient::InitProxy() +void BackgroundTaskManagerAccessClient::InitProxy() { auto sam = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); if (sam == nullptr) { @@ -112,13 +112,13 @@ void BackgourndTaskManagerAccessClient::InitProxy() } } -void BackgourndTaskManagerAccessClient::OnRemoteDiedHandle() +void BackgroundTaskManagerAccessClient::OnRemoteDiedHandle() { std::lock_guard lock(proxyMutex_); ReleaseProxy(); } -sptr BackgourndTaskManagerAccessClient::GetProxy() +sptr BackgroundTaskManagerAccessClient::GetProxy() { std::lock_guard lock(proxyMutex_); if (proxy_ == nullptr || proxy_->AsObject() == nullptr || proxy_->AsObject()->IsObjectDead()) { @@ -127,7 +127,7 @@ sptr BackgourndTaskManagerAccessClient::GetProxy() return proxy_; } -void BackgourndTaskManagerAccessClient::ReleaseProxy() +void BackgroundTaskManagerAccessClient::ReleaseProxy() { if ((proxy_ != nullptr) && (proxy_->AsObject() != nullptr) && (serviceDeathObserver_ != nullptr)) { proxy_->AsObject()->RemoveDeathRecipient(serviceDeathObserver_); diff --git a/services/common/background_task_manager/src/background_task_manager_death_recipient.cpp b/services/common/background_task_manager/src/background_task_manager_death_recipient.cpp index 2f127c613..82d337d03 100644 --- a/services/common/background_task_manager/src/background_task_manager_death_recipient.cpp +++ b/services/common/background_task_manager/src/background_task_manager_death_recipient.cpp @@ -24,7 +24,7 @@ namespace AccessToken { void BackgroundTaskMgrDeathRecipient::OnRemoteDied(const wptr& object) { LOGI(ATM_DOMAIN, ATM_TAG, "%{public}s called", __func__); - BackgourndTaskManagerAccessClient::GetInstance().OnRemoteDiedHandle(); + BackgroundTaskManagerAccessClient::GetInstance().OnRemoteDiedHandle(); } } // namespace AccessToken } // namespace Security diff --git a/services/privacymanager/src/record/permission_record_manager.cpp b/services/privacymanager/src/record/permission_record_manager.cpp index 2e57a7ed5..0bf3ca277 100644 --- a/services/privacymanager/src/record/permission_record_manager.cpp +++ b/services/privacymanager/src/record/permission_record_manager.cpp @@ -596,14 +596,10 @@ void PermissionRecordManager::RemoveHistoryPermissionUsedRecords(std::unordered_ { // remove from record cache std::lock_guard lock(permUsedRecMutex_); - auto it = permUsedRecList_.begin(); - while (it != permUsedRecList_.end()) { - if (tokenIDList.find(it->record.tokenId) != tokenIDList.end()) { - it = permUsedRecList_.erase(it); - } else { - ++it; - } - } + permUsedRecList_.erase(std::remove_if(permUsedRecList_.begin(), permUsedRecList_.end(), + [&tokenIDList](const PermissionRecordCache& recordCache) { + return tokenIDList.find(recordCache.record.tokenId) != tokenIDList.end(); + }), permUsedRecList_.end()); } } @@ -612,14 +608,10 @@ void PermissionRecordManager::RemovePermissionUsedRecords(AccessTokenID tokenId) { // remove from record cache std::lock_guard lock(permUsedRecMutex_); - auto it = permUsedRecList_.begin(); - while (it != permUsedRecList_.end()) { - if (tokenId == it->record.tokenId) { - it = permUsedRecList_.erase(it); - } else { - ++it; - } - } + permUsedRecList_.erase(std::remove_if(permUsedRecList_.begin(), permUsedRecList_.end(), + [tokenId](const PermissionRecordCache& recordCache) { + return recordCache.record.tokenId == tokenId; + }), permUsedRecList_.end()); } GenericValues conditions; diff --git a/services/tokensyncmanager/test/coverage/token_sync_service_coverage_test.cpp b/services/tokensyncmanager/test/coverage/token_sync_service_coverage_test.cpp index 4e8f3079b..10b888c2f 100644 --- a/services/tokensyncmanager/test/coverage/token_sync_service_coverage_test.cpp +++ b/services/tokensyncmanager/test/coverage/token_sync_service_coverage_test.cpp @@ -202,6 +202,9 @@ HWTEST_F(TokenSyncServiceTest, InsertCallbackAndExcute001, TestSize.Level4) { SoftBusDeviceConnectionListener listener; listener.OnDeviceOffline(g_devInfo); + DeviceInfoRepository::GetInstance().SaveDeviceInfo(g_devInfo.networkId, "123", g_devInfo.deviceId, + g_devInfo.deviceName, std::to_string(g_devInfo.deviceTypeId)); + listener.OnDeviceOffline(g_devInfo); SoftBusChannel channel("test"); std::string test("test"); channel.InsertCallback(0, test); -- Gitee