diff --git a/frameworks/extension/src/js_work_scheduler_extension.cpp b/frameworks/extension/src/js_work_scheduler_extension.cpp index da856b1ac913d082398ce9de8de59d8f68f3181d..9eb360b62d451c0850ac5fdf8a87292a8bd93e5c 100644 --- a/frameworks/extension/src/js_work_scheduler_extension.cpp +++ b/frameworks/extension/src/js_work_scheduler_extension.cpp @@ -85,9 +85,8 @@ void JsWorkSchedulerExtension::Init(const std::shared_ptr JsWorkSchedulerExtension::OnConnect(const AAFwk::Want& want) void JsWorkSchedulerExtension::OnDisconnect(const AAFwk::Want& want) { - AbilityRuntime::Extension::OnDisconnect(want); WS_HILOGI("WorkSchedulerExtension %{public}s begin.", __func__); - WS_HILOGI("WorkSchedulerExtension %{public}s end.", __func__); + AbilityRuntime::Extension::OnDisconnect(want); } void JsWorkSchedulerExtension::OnWorkStart() diff --git a/services/native/include/work_policy_manager.h b/services/native/include/work_policy_manager.h index 94de0500eb55367a639952031b9e90e5d3ddd136..d23bce44de22408247725bfebb2ac148ce64dbe7 100644 --- a/services/native/include/work_policy_manager.h +++ b/services/native/include/work_policy_manager.h @@ -46,7 +46,6 @@ public: bool AddWork(std::shared_ptr workStatus, int32_t uid); bool RemoveWork(std::shared_ptr workStatus, int32_t uid); bool StopWork(std::shared_ptr workStatus, int32_t uid, const bool needCancel, bool isTimeOut); - bool CancelWork(std::shared_ptr workStatus, int32_t uid); bool StopAndClearWorks(int32_t uid); bool IsLastWorkTimeout(int32_t workId, int32_t uid); std::shared_ptr FindWorkStatus(WorkInfo& workInfo, int32_t uid); diff --git a/services/native/src/work_conn_manager.cpp b/services/native/src/work_conn_manager.cpp index 80c8089588ca2344a7be0237e2db457bb2982c50..7597e792c32b4aa7013c3b659b2e484064a05839 100644 --- a/services/native/src/work_conn_manager.cpp +++ b/services/native/src/work_conn_manager.cpp @@ -43,7 +43,7 @@ void WorkConnManager::RemoveConnInfo(string &workId) sptr WorkConnManager::GetConnInfo(string &workId) { std::lock_guard lock(connMapMutex_); - if (connMap_.count(workId) >= 0) { + if (connMap_.count(workId) > 0) { return connMap_.at(workId); } return nullptr; diff --git a/services/native/src/work_policy_manager.cpp b/services/native/src/work_policy_manager.cpp index 6ad5e0186d1112b72657777599ff94376cca5c2a..49d674d03b1ea1d311d1e1f4a2d0c81ea854fedc 100644 --- a/services/native/src/work_policy_manager.cpp +++ b/services/native/src/work_policy_manager.cpp @@ -169,20 +169,6 @@ bool WorkPolicyManager::StopWork(std::shared_ptr workStatus, int32_t return hasCanceled; } -bool WorkPolicyManager::CancelWork(shared_ptr workStatus, int32_t uid) -{ - WS_HILOGI("WorkPolicyManager::CancelWork"); - std::lock_guard lock(uidMapMutex_); - if (uidQueueMap_.count(uid) > 0) { - bool ret = uidQueueMap_.at(uid)->Remove(workStatus); - if (uidQueueMap_.at(uid)->GetSize() <= 0) { - uidQueueMap_.erase(uid); - } - return ret; - } - return true; -} - bool WorkPolicyManager::StopAndClearWorks(int32_t uid) { WS_HILOGI("WorkPolicyManager::StopAndClearWorks");