openharmony/ability_ability_runtime
1
0
Fork 0
mirror of https://github.com/openharmony/ability_ability_runtime.git synced 2026-08-25 12:23:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

!9907 生命周期整改

Browse Source 
Merge pull request !9907 from ZhangYan/yxg_0816
This commit is contained in:
openharmony_ci
2024-08-20 03:13:03 +00:00
committed by Gitee
parent bfeb209eb4 4f62d33508
commit 1e0b2d1195
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/appmgr/src/app_running_manager.cpp
+5 -1
View File
@@ -555,6 +555,7 @@ void AppRunningManager::HandleAbilityAttachTimeOut(const sptr<IRemoteObject> &to
std::shared_ptr<AbilityRunningRecord> abilityRecord = appRecord->GetAbilityRunningRecordByToken(token);
bool isSCB = false;
bool isPage = false;
if (abilityRecord) {
abilityRecord->SetTerminating();
isSCB = abilityRecord->IsSceneBoard();
@@ -562,9 +563,12 @@ void AppRunningManager::HandleAbilityAttachTimeOut(const sptr<IRemoteObject> &to
pid_t pid = appRecord->GetPriorityObject()->GetPid();
(void)serviceInner->KillProcessByPid(pid, "AttachTimeoutKillSCB");
}
if (abilityRecord->GetAbilityInfo() != nullptr) {
isPage = (abilityRecord->GetAbilityInfo()->type == AbilityType::PAGE);
}
}
if ((isSCB || appRecord->IsLastAbilityRecord(token)) && (!appRecord->IsKeepAliveApp() ||
if ((isSCB || isPage || appRecord->IsLastAbilityRecord(token)) && (!appRecord->IsKeepAliveApp() ||
!ExitResidentProcessManager::GetInstance().IsMemorySizeSufficent())) {
appRecord->SetTerminating();
}