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

fixed 92cc0da from https://gitee.com/altay/ability_ability_runtime/pulls/3772

Browse Source 
Description:fix pending state
Sig:SIG_ApplicationFramework
Feature or Bugfix:Bugfix
Binary Source:No

Signed-off-by: yuwenze <yuaqiang1@huawei.com>
Change-Id: I62183c7f47e8e8cb2aa976f76690f666eb5246a2
This commit is contained in:
yuwenze
2022-11-10 02:32:01 +00:00
committed by 于文泽
parent d4eec6a971
commit 031281008d
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/abilitymgr/src/ability_manager_service.cpp
+8
View File
@@ -4643,6 +4643,14 @@ int AbilityManagerService::DoAbilityForeground(const sptr<IRemoteObject> &token,
return ERR_WOULD_BLOCK;
}
if (abilityRecord->GetPendingState() == AbilityState::FOREGROUND) {
HILOG_DEBUG("pending state is FOREGROUND.");
abilityRecord->SetPendingState(AbilityState::FOREGROUND);
return ERR_OK;
} else {
HILOG_DEBUG("pending state is not FOREGROUND.");
abilityRecord->SetPendingState(AbilityState::FOREGROUND);
}
abilityRecord->ProcessForegroundAbility(flag);
return ERR_OK;
}
services/abilitymgr/src/mission_list_manager.cpp
+7 -7
View File
@@ -272,11 +272,11 @@ int MissionListManager::StartAbilityLocked(const std::shared_ptr<AbilityRecord>
}
if (targetAbilityRecord->GetPendingState() == AbilityState::FOREGROUND) {
HILOG_ERROR("pending state is FOREGROUND.");
HILOG_DEBUG("pending state is FOREGROUND.");
targetAbilityRecord->SetPendingState(AbilityState::FOREGROUND);
return 0;
return ERR_OK;
} else {
HILOG_ERROR("pending state is not FOREGROUND.");
HILOG_DEBUG("pending state is not FOREGROUND.");
targetAbilityRecord->SetPendingState(AbilityState::FOREGROUND);
}
@@ -322,7 +322,7 @@ int MissionListManager::StartAbilityLocked(const std::shared_ptr<AbilityRecord>
#else
targetAbilityRecord->ProcessForegroundAbility();
#endif
return 0;
return ERR_OK;
}
static int32_t CallType2StartMethod(int32_t callType)
@@ -719,7 +719,7 @@ int MissionListManager::MinimizeAbilityLocked(const std::shared_ptr<AbilityRecor
abilityRecord->SetPendingState(AbilityState::BACKGROUND);
if (!abilityRecord->IsAbilityState(AbilityState::FOREGROUND)) {
HILOG_ERROR("Minimize ability fail, ability state is invalid, not foregroundnew or foregerounding_new.");
HILOG_ERROR("Fail to minimize ability, ability state is not foreground.");
return ERR_OK;
}
@@ -1054,7 +1054,7 @@ void MissionListManager::CompleteForegroundSuccess(const std::shared_ptr<Ability
UpdateMissionTimeStamp(abilityRecord);
}
} else if (abilityRecord->GetPendingState() == AbilityState::FOREGROUND) {
HILOG_ERROR("not continuous startup.");
HILOG_DEBUG("not continuous startup.");
abilityRecord->SetPendingState(AbilityState::INITIAL);
}
}
@@ -1115,7 +1115,7 @@ void MissionListManager::CompleteBackground(const std::shared_ptr<AbilityRecord>
if (abilityRecord->GetPendingState() == AbilityState::FOREGROUND) {
DelayedSingleton<AppScheduler>::GetInstance()->MoveToForeground(abilityRecord->GetToken());
} else if (abilityRecord->GetPendingState() == AbilityState::BACKGROUND) {
HILOG_ERROR("not continuous startup.");
HILOG_DEBUG("not continuous startup.");
abilityRecord->SetPendingState(AbilityState::INITIAL);
}