diff --git a/services/abilitymgr/src/ability_manager_service.cpp b/services/abilitymgr/src/ability_manager_service.cpp index d6dfb56f37..b4f94683ae 100644 --- a/services/abilitymgr/src/ability_manager_service.cpp +++ b/services/abilitymgr/src/ability_manager_service.cpp @@ -4643,6 +4643,14 @@ int AbilityManagerService::DoAbilityForeground(const sptr &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; } diff --git a/services/abilitymgr/src/mission_list_manager.cpp b/services/abilitymgr/src/mission_list_manager.cpp index 3c1e7c31d1..088c0bd337 100644 --- a/services/abilitymgr/src/mission_list_manager.cpp +++ b/services/abilitymgr/src/mission_list_manager.cpp @@ -272,11 +272,11 @@ int MissionListManager::StartAbilityLocked(const std::shared_ptr } 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 #else targetAbilityRecord->ProcessForegroundAbility(); #endif - return 0; + return ERR_OK; } static int32_t CallType2StartMethod(int32_t callType) @@ -720,7 +720,7 @@ int MissionListManager::MinimizeAbilityLocked(const std::shared_ptrSetPendingState(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; } @@ -1059,7 +1059,7 @@ void MissionListManager::CompleteForegroundSuccess(const std::shared_ptrGetPendingState() == AbilityState::FOREGROUND) { - HILOG_ERROR("not continuous startup."); + HILOG_DEBUG("not continuous startup."); abilityRecord->SetPendingState(AbilityState::INITIAL); } } @@ -1120,7 +1120,7 @@ void MissionListManager::CompleteBackground(const std::shared_ptr if (abilityRecord->GetPendingState() == AbilityState::FOREGROUND) { DelayedSingleton::GetInstance()->MoveToForeground(abilityRecord->GetToken()); } else if (abilityRecord->GetPendingState() == AbilityState::BACKGROUND) { - HILOG_ERROR("not continuous startup."); + HILOG_DEBUG("not continuous startup."); abilityRecord->SetPendingState(AbilityState::INITIAL); }