From 9d2dd323198665f251d0af7adec62e216f4d6318 Mon Sep 17 00:00:00 2001 From: gongguilin Date: Sat, 28 Dec 2024 09:40:47 +0800 Subject: [PATCH] add Signed-off-by: gongguilin --- services/samgr/native/include/system_ability_manager.h | 2 +- services/samgr/native/source/system_ability_manager.cpp | 8 ++++---- .../samgrcoverage_fuzzer/samgrcoverage_fuzzer.cpp | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/services/samgr/native/include/system_ability_manager.h b/services/samgr/native/include/system_ability_manager.h index 61940bfe..36644f91 100644 --- a/services/samgr/native/include/system_ability_manager.h +++ b/services/samgr/native/include/system_ability_manager.h @@ -292,7 +292,7 @@ private: void CheckListenerNotify(int32_t systemAbilityId, const sptr& listener); void NotifySystemAbilityChanged(int32_t systemAbilityId, const std::string& deviceId, int32_t code, const sptr& listener); - void NotifySystemAbilityAddedBySync(int32_t systemAbilityId, const sptr& listener); + void NotifySystemAbilityAddedByAsync(int32_t systemAbilityId, const sptr& listener); void UnSubscribeSystemAbilityLocked(std::list& listenerList, const sptr& listener); diff --git a/services/samgr/native/source/system_ability_manager.cpp b/services/samgr/native/source/system_ability_manager.cpp index 57ddc72b..6f00bb54 100644 --- a/services/samgr/native/source/system_ability_manager.cpp +++ b/services/samgr/native/source/system_ability_manager.cpp @@ -842,11 +842,11 @@ vector SystemAbilityManager::ListSystemAbilities(uint32_t dumpFlags) return list; } -void SystemAbilityManager::NotifySystemAbilityAddedBySync(int32_t systemAbilityId, +void SystemAbilityManager::NotifySystemAbilityAddedByAsync(int32_t systemAbilityId, const sptr& listener) { if (workHandler_ == nullptr) { - HILOGE("NotifySystemAbilityAddedBySync workHandler is nullptr"); + HILOGE("NotifySystemAbilityAddedByAsync workHandler is nullptr"); return; } else { auto listenerNotifyTask = [systemAbilityId, listener, this]() { @@ -854,7 +854,7 @@ void SystemAbilityManager::NotifySystemAbilityAddedBySync(int32_t systemAbilityI static_cast(SamgrInterfaceCode::ADD_SYSTEM_ABILITY_TRANSACTION), listener); }; if (!workHandler_->PostTask(listenerNotifyTask)) { - HILOGE("NotifySystemAbilityAddedBySync PostTask fail SA:%{public}d", systemAbilityId); + HILOGE("NotifySystemAbilityAddedByAsync PostTask fail SA:%{public}d", systemAbilityId); } } } @@ -874,7 +874,7 @@ void SystemAbilityManager::CheckListenerNotify(int32_t systemAbilityId, if (itemListener.state == ListenerState::INIT) { HILOGI("NotifyAddSA:%{public}d,%{public}d_%{public}d", systemAbilityId, callingPid, subscribeCountMap_[callingPid]); - NotifySystemAbilityAddedBySync(systemAbilityId, listener); + NotifySystemAbilityAddedByAsync(systemAbilityId, listener); itemListener.state = ListenerState::NOTIFIED; } else { HILOGI("Subscribe Listener has been notified,SA:%{public}d,callpid:%{public}d", diff --git a/test/fuzztest/samgrcoverage_fuzzer/samgrcoverage_fuzzer.cpp b/test/fuzztest/samgrcoverage_fuzzer/samgrcoverage_fuzzer.cpp index 8be2da17..5f9d24d6 100644 --- a/test/fuzztest/samgrcoverage_fuzzer/samgrcoverage_fuzzer.cpp +++ b/test/fuzztest/samgrcoverage_fuzzer/samgrcoverage_fuzzer.cpp @@ -223,7 +223,7 @@ void FuzzDoLoadOnDemandAbility(const uint8_t* data, size_t size) saMgr->DoLoadOnDemandAbility(saId, isExist); } -void FuzzNotifySystemAbilityAddedBySync(const uint8_t* data, size_t size) +void FuzzNotifySystemAbilityAddedByAsync(const uint8_t* data, size_t size) { sptr saMgr = new SystemAbilityManager; if (saMgr == nullptr) { @@ -232,7 +232,7 @@ void FuzzNotifySystemAbilityAddedBySync(const uint8_t* data, size_t size) FuzzedDataProvider fdp(data, size); int32_t saId = fdp.ConsumeIntegral(); sptr listener; - saMgr->NotifySystemAbilityAddedBySync(saId, listener); + saMgr->NotifySystemAbilityAddedByAsync(saId, listener); } void FuzzSendLoadedSystemAbilityMsg(const uint8_t* data, size_t size) @@ -325,7 +325,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) OHOS::Samgr::FuzzNotifySystemAbilityChanged(data, size); OHOS::Samgr::FuzzRemoveOnDemandSaInDiedProc(data, size); OHOS::Samgr::FuzzDoLoadOnDemandAbility(data, size); - OHOS::Samgr::FuzzNotifySystemAbilityAddedBySync(data, size); + OHOS::Samgr::FuzzNotifySystemAbilityAddedByAsync(data, size); OHOS::Samgr::FuzzSendLoadedSystemAbilityMsg(data, size); OHOS::Samgr::FuzzNotifySystemAbilityLoadFail(data, size); OHOS::Samgr::FuzzStartingSystemProcessLocked(data, size); -- Gitee