From e5732aa5be99a74c74bd2c7bca0c827f4ed34293 Mon Sep 17 00:00:00 2001 From: yuwenze Date: Mon, 21 Nov 2022 09:20:29 +0000 Subject: [PATCH] Description:background not update mission time stamp Sig:SIG_ApplicationFramework Feature or Bugfix:Bugfix Binary Source:No Signed-off-by: yuwenze Change-Id: I2d7d60b4a8e38d570d78ee354a37d66a3893cfed --- .../abilitymgr/include/mission_info_mgr.h | 8 ------- .../abilitymgr/include/mission_list_manager.h | 1 - services/abilitymgr/src/mission_info_mgr.cpp | 22 ------------------- .../abilitymgr/src/mission_list_manager.cpp | 16 -------------- .../missioninfomgrb_fuzzer.cpp | 1 - .../missionlistmanagersecond_fuzzer.cpp | 1 - 6 files changed, 49 deletions(-) diff --git a/services/abilitymgr/include/mission_info_mgr.h b/services/abilitymgr/include/mission_info_mgr.h index 240a454bc2..1d5ed841fd 100644 --- a/services/abilitymgr/include/mission_info_mgr.h +++ b/services/abilitymgr/include/mission_info_mgr.h @@ -102,14 +102,6 @@ public: */ bool FindReusedMissionInfo(const std::string &missionName, const std::string &flag, InnerMissionInfo &info); - /** - * @brief Update mission timestamp. - * - * @param missionId indicates this mission id. - * @param timestamp indicates this mission timestamp. - */ - void UpdateMissionTimeStamp(int32_t missionId, const std::string& timestamp); - /** * @brief Delete all the mission info. * diff --git a/services/abilitymgr/include/mission_list_manager.h b/services/abilitymgr/include/mission_list_manager.h index 6c9f2e0e01..745b60af42 100644 --- a/services/abilitymgr/include/mission_list_manager.h +++ b/services/abilitymgr/include/mission_list_manager.h @@ -420,7 +420,6 @@ private: std::shared_ptr GetAbilityRecordByCaller( const std::shared_ptr &caller, int requestCode); std::shared_ptr GetTargetMissionList(int missionId, std::shared_ptr &mission); - void UpdateMissionTimeStamp(const std::shared_ptr &abilityRecord); void PostStartWaitingAbility(); void HandleAbilityDied(std::shared_ptr abilityRecord); void HandleLauncherDied(std::shared_ptr ability); diff --git a/services/abilitymgr/src/mission_info_mgr.cpp b/services/abilitymgr/src/mission_info_mgr.cpp index 7240f4ff7c..a84c2bad5d 100644 --- a/services/abilitymgr/src/mission_info_mgr.cpp +++ b/services/abilitymgr/src/mission_info_mgr.cpp @@ -320,28 +320,6 @@ bool MissionInfoMgr::FindReusedMissionInfo(const std::string &missionName, return true; } -void MissionInfoMgr::UpdateMissionTimeStamp(int32_t missionId, const std::string& timestamp) -{ - std::lock_guard lock(mutex_); - auto it = find_if(missionInfoList_.begin(), missionInfoList_.end(), [missionId](const InnerMissionInfo &info) { - return missionId == info.missionInfo.id; - }); - if (it == missionInfoList_.end()) { - HILOG_ERROR("UpdateMissionTimeStamp failed, missionId %{public}d not exists", missionId); - return; - } - - if (timestamp == it->missionInfo.time) { - return; - } - InnerMissionInfo updateInfo = *it; - updateInfo.missionInfo.time = timestamp; - - missionInfoList_.erase(it); - missionIdMap_.erase(missionId); - (void)AddMissionInfo(updateInfo); -} - int MissionInfoMgr::UpdateMissionLabel(int32_t missionId, const std::string& label) { std::lock_guard lock(mutex_); diff --git a/services/abilitymgr/src/mission_list_manager.cpp b/services/abilitymgr/src/mission_list_manager.cpp index 508b0eaf7a..0bddb88e09 100644 --- a/services/abilitymgr/src/mission_list_manager.cpp +++ b/services/abilitymgr/src/mission_list_manager.cpp @@ -726,9 +726,6 @@ int MissionListManager::MinimizeAbilityLocked(const std::shared_ptrSetMinimizeReason(fromUser); MoveToBackgroundTask(abilityRecord); - if (abilityRecord->lifeCycleStateInfo_.sceneFlag != SCENE_FLAG_KEYGUARD) { - UpdateMissionTimeStamp(abilityRecord); - } return ERR_OK; } @@ -1063,9 +1060,6 @@ void MissionListManager::CompleteForegroundSuccess(const std::shared_ptrGetPendingState() == AbilityState::BACKGROUND) { abilityRecord->SetMinimizeReason(true); MoveToBackgroundTask(abilityRecord); - if (abilityRecord->lifeCycleStateInfo_.sceneFlag != SCENE_FLAG_KEYGUARD) { - UpdateMissionTimeStamp(abilityRecord); - } } else if (abilityRecord->GetPendingState() == AbilityState::FOREGROUND) { HILOG_DEBUG("not continuous startup."); abilityRecord->SetPendingState(AbilityState::INITIAL); @@ -2062,16 +2056,6 @@ sptr MissionListManager::GetAbilityTokenByMissionId(int32_t missi return defaultStandardList_->GetAbilityTokenByMissionId((missionId)); } -void MissionListManager::UpdateMissionTimeStamp(const std::shared_ptr &abilityRecord) -{ - auto mission = abilityRecord->GetMission(); - if (!mission) { - return; - } - std::string curTime = GetCurrentTime(); - DelayedSingleton::GetInstance()->UpdateMissionTimeStamp(mission->GetMissionId(), curTime); -} - void MissionListManager::PostStartWaitingAbility() { auto self(shared_from_this()); diff --git a/test/fuzztest/missioninfomgrb_fuzzer/missioninfomgrb_fuzzer.cpp b/test/fuzztest/missioninfomgrb_fuzzer/missioninfomgrb_fuzzer.cpp index 106690e8f6..dcaf94591d 100755 --- a/test/fuzztest/missioninfomgrb_fuzzer/missioninfomgrb_fuzzer.cpp +++ b/test/fuzztest/missioninfomgrb_fuzzer/missioninfomgrb_fuzzer.cpp @@ -53,7 +53,6 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) missionInfoMgr->GetMissionInfoById(int32Param, missionInfo); missionInfoMgr->GetInnerMissionInfoById(int32Param, innerMissionInfo); missionInfoMgr->FindReusedMissionInfo(stringParam, stringParam, innerMissionInfo); - missionInfoMgr->UpdateMissionTimeStamp(int32Param, stringParam); return true; } diff --git a/test/fuzztest/missionlistmanagersecond_fuzzer/missionlistmanagersecond_fuzzer.cpp b/test/fuzztest/missionlistmanagersecond_fuzzer/missionlistmanagersecond_fuzzer.cpp index a3e3fd8807..01a716d325 100755 --- a/test/fuzztest/missionlistmanagersecond_fuzzer/missionlistmanagersecond_fuzzer.cpp +++ b/test/fuzztest/missionlistmanagersecond_fuzzer/missionlistmanagersecond_fuzzer.cpp @@ -119,7 +119,6 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) missionListManager->GetTargetMissionList(intParam, mission); missionListManager->GetMissionIdByAbilityToken(token); missionListManager->GetAbilityTokenByMissionId(int32Param); - missionListManager->UpdateMissionTimeStamp(abilityRecord); missionListManager->PostStartWaitingAbility(); missionListManager->HandleAbilityDied(abilityRecord); missionListManager->HandleLauncherDied(abilityRecord);