diff --git a/services/samgr/native/source/collect/common_event_collect.cpp b/services/samgr/native/source/collect/common_event_collect.cpp index 17c15b55a412796a67f85535b7ca69dc418e97e6..b1eaf7bbd7288d75805e8567ea21579595266aa7 100644 --- a/services/samgr/native/source/collect/common_event_collect.cpp +++ b/services/samgr/native/source/collect/common_event_collect.cpp @@ -357,14 +357,17 @@ int64_t CommonEventCollect::SaveOnDemandReasonExtraData(const EventFwk::CommonEv wantMap[UID] = std::to_string(uid); wantMap[NET_TYPE] = std::to_string(netType); wantMap[BUNDLE_NAME] = want.GetBundle(); - std::lock_guard autoLock(extraDataLock_); - wantMap[COMMON_EVENT_ACTION_NAME] = want.GetAction(); - OnDemandReasonExtraData extraData(data.GetCode(), data.GetData(), wantMap); + int64_t extraDataId = 0; + { + std::lock_guard autoLock(extraDataLock_); + wantMap[COMMON_EVENT_ACTION_NAME] = want.GetAction(); + OnDemandReasonExtraData extraData(data.GetCode(), data.GetData(), wantMap); - int64_t extraDataId = GenerateExtraDataIdLocked(); - extraDatas_[extraDataId] = extraData; - HILOGD("CommonEventCollect save extraData %{public}d,n:%{public}zu", - static_cast(extraDataId), extraDatas_.size()); + extraDataId = GenerateExtraDataIdLocked(); + extraDatas_[extraDataId] = extraData; + HILOGD("CommonEventCollect save extraData %{public}d,n:%{public}zu", + static_cast(extraDataId), extraDatas_.size()); + } if (workHandler_ == nullptr) { HILOGI("CommonEventCollect workHandler is nullptr"); return -1; @@ -389,14 +392,14 @@ void CommonEventCollect::RemoveOnDemandReasonExtraData(int64_t extraDataId) std::lock_guard autoLock(extraDataLock_); extraDatas_.erase(extraDataId); } - HILOGD("CommonEventCollect remove extraData %{public}d", static_cast(extraDataId)); + HILOGI("CommonEventCollect remove extraData %{public}d", static_cast(extraDataId)); RemoveSaExtraDataId(extraDataId); } bool CommonEventCollect::GetOnDemandReasonExtraData(int64_t extraDataId, OnDemandReasonExtraData& extraData) { std::lock_guard autoLock(extraDataLock_); - HILOGD("CommonEventCollect get extraData %{public}d", static_cast(extraDataId)); + HILOGI("CommonEventCollect get extraData %{public}d", static_cast(extraDataId)); if (extraDatas_.count(extraDataId) == 0) { return false; }