openharmony/ability_ability_runtime
1
0
Fork 0
mirror of https://gitee.com/openharmony/ability_ability_runtime synced 2024-11-27 01:10:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!9453 【Bugfix】修复进程维度的PendingState机制

Browse Source 
Merge pull request !9453 from 于文泽/bugfix
This commit is contained in:
openharmony_ci 2024-07-18 14:47:16 +00:00 committed by Gitee
commit 87287553cd
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
services/appmgr/src/app_running_record.cpp
View File

@ -970,9 +970,10 @@ void AppRunningRecord::AbilityForeground(const std::shared_ptr<AbilityRunningRec
}
if (curState_ == ApplicationState::APP_STATE_READY || curState_ == ApplicationState::APP_STATE_BACKGROUND
|| curState_ == ApplicationState::APP_STATE_FOREGROUND) {
if (foregroundingAbilityTokens_.empty() || pendingState_ == ApplicationPendingState::BACKGROUNDING) {
TAG_LOGD(AAFwkTag::APPMGR, "application foregrounding.");
SetApplicationPendingState(ApplicationPendingState::FOREGROUNDING);
TAG_LOGD(AAFwkTag::APPMGR, "application foregrounding.");
auto pendingState = pendingState_;
SetApplicationPendingState(ApplicationPendingState::FOREGROUNDING);
if (pendingState == ApplicationPendingState::READY) {
ScheduleForegroundRunning();
}
foregroundingAbilityTokens_.insert(ability->GetToken());
@ -1024,8 +1025,11 @@ void AppRunningRecord::AbilityBackground(const std::shared_ptr<AbilityRunningRec
// Then schedule application background when all ability is not foreground.
if (foregroundSize == 0 && mainBundleName_ != LAUNCHER_NAME && windowIds_.empty()) {
auto pendingState = pendingState_;
SetApplicationPendingState(ApplicationPendingState::BACKGROUNDING);
ScheduleBackgroundRunning();
if (pendingState == ApplicationPendingState::READY) {
ScheduleBackgroundRunning();
}
}
} else {
TAG_LOGW(AAFwkTag::APPMGR, "wrong application state");