diff --git a/interfaces/inner_api/app_manager/include/appmgr/istart_specified_ability_response.h b/interfaces/inner_api/app_manager/include/appmgr/istart_specified_ability_response.h index 67ea021fec..0777f67ee1 100644 --- a/interfaces/inner_api/app_manager/include/appmgr/istart_specified_ability_response.h +++ b/interfaces/inner_api/app_manager/include/appmgr/istart_specified_ability_response.h @@ -36,15 +36,13 @@ public: /** * @brief called when the module's onAcceptWant happens time out - * @param want request param * @param requestId a number represents a request */ - virtual void OnTimeoutResponse(const AAFwk::Want &want, int32_t requestId) = 0; + virtual void OnTimeoutResponse(int32_t requestId) = 0; - virtual void OnNewProcessRequestResponse(const AAFwk::Want &want, const std::string &flag, - int32_t requestId) = 0; + virtual void OnNewProcessRequestResponse(const std::string &flag, int32_t requestId) = 0; - virtual void OnNewProcessRequestTimeoutResponse(const AAFwk::Want &want, int32_t requestId) = 0; + virtual void OnNewProcessRequestTimeoutResponse(int32_t requestId) = 0; virtual void OnStartSpecifiedFailed(int32_t requestId) {}; diff --git a/interfaces/inner_api/app_manager/include/appmgr/start_specified_ability_response_proxy.h b/interfaces/inner_api/app_manager/include/appmgr/start_specified_ability_response_proxy.h index 6f8f5da466..bf2037afc0 100644 --- a/interfaces/inner_api/app_manager/include/appmgr/start_specified_ability_response_proxy.h +++ b/interfaces/inner_api/app_manager/include/appmgr/start_specified_ability_response_proxy.h @@ -36,15 +36,13 @@ public: /** * @brief called when the module's onAcceptWant happens time out - * @param want request param * @param requestId a number represents a request */ - virtual void OnTimeoutResponse(const AAFwk::Want &want, int32_t requestId) override; + virtual void OnTimeoutResponse(int32_t requestId) override; - virtual void OnNewProcessRequestResponse(const AAFwk::Want &want, const std::string &flag, - int32_t requestId = 0) override; + virtual void OnNewProcessRequestResponse(const std::string &flag, int32_t requestId = 0) override; - virtual void OnNewProcessRequestTimeoutResponse(const AAFwk::Want &want, int32_t requestId) override; + virtual void OnNewProcessRequestTimeoutResponse(int32_t requestId) override; virtual void OnStartSpecifiedFailed(int32_t requestId) override; diff --git a/interfaces/inner_api/app_manager/src/appmgr/start_specified_ability_response_proxy.cpp b/interfaces/inner_api/app_manager/src/appmgr/start_specified_ability_response_proxy.cpp index a34386c5d0..024dfee1d0 100644 --- a/interfaces/inner_api/app_manager/src/appmgr/start_specified_ability_response_proxy.cpp +++ b/interfaces/inner_api/app_manager/src/appmgr/start_specified_ability_response_proxy.cpp @@ -38,7 +38,7 @@ void StartSpecifiedAbilityResponseProxy::OnAcceptWantResponse( TAG_LOGD(AAFwkTag::APPMGR, "On accept want by proxy."); MessageParcel data; MessageParcel reply; - MessageOption option(MessageOption::TF_SYNC); + MessageOption option(MessageOption::TF_ASYNC); if (!WriteInterfaceToken(data)) { return; } @@ -55,16 +55,16 @@ void StartSpecifiedAbilityResponseProxy::OnAcceptWantResponse( } } -void StartSpecifiedAbilityResponseProxy::OnTimeoutResponse(const AAFwk::Want &want, int32_t requestId) +void StartSpecifiedAbilityResponseProxy::OnTimeoutResponse(int32_t requestId) { TAG_LOGD(AAFwkTag::APPMGR, "On timeout response by proxy."); MessageParcel data; MessageParcel reply; - MessageOption option(MessageOption::TF_SYNC); + MessageOption option(MessageOption::TF_ASYNC); if (!WriteInterfaceToken(data)) { return; } - if (!data.WriteParcelable(&want) || !data.WriteInt32(requestId)) { + if (!data.WriteInt32(requestId)) { TAG_LOGE(AAFwkTag::APPMGR, "Write data failed."); return; } @@ -88,18 +88,16 @@ int32_t StartSpecifiedAbilityResponseProxy::SendTransactCmd(uint32_t code, Messa return remote->SendRequest(code, data, reply, option); } -void StartSpecifiedAbilityResponseProxy::OnNewProcessRequestResponse(const AAFwk::Want &want, const std::string &flag, - int32_t requestId) +void StartSpecifiedAbilityResponseProxy::OnNewProcessRequestResponse(const std::string &flag, int32_t requestId) { TAG_LOGD(AAFwkTag::APPMGR, "On satrt specified process response by proxy."); MessageParcel data; MessageParcel reply; - MessageOption option(MessageOption::TF_SYNC); + MessageOption option(MessageOption::TF_ASYNC); if (!WriteInterfaceToken(data)) { return; } - if (!data.WriteParcelable(&want) || !data.WriteString(flag) || - !data.WriteInt32(requestId)) { + if (!data.WriteString(flag) || !data.WriteInt32(requestId)) { TAG_LOGE(AAFwkTag::APPMGR, "Write data failed."); return; } @@ -117,17 +115,16 @@ void StartSpecifiedAbilityResponseProxy::OnNewProcessRequestResponse(const AAFwk } } -void StartSpecifiedAbilityResponseProxy::OnNewProcessRequestTimeoutResponse(const AAFwk::Want &want, - int32_t requestId) +void StartSpecifiedAbilityResponseProxy::OnNewProcessRequestTimeoutResponse(int32_t requestId) { TAG_LOGD(AAFwkTag::APPMGR, "On start specified process timeout response by proxy."); MessageParcel data; MessageParcel reply; - MessageOption option(MessageOption::TF_SYNC); + MessageOption option(MessageOption::TF_ASYNC); if (!WriteInterfaceToken(data)) { return; } - if (!data.WriteParcelable(&want) || data.WriteInt32(requestId)) { + if (data.WriteInt32(requestId)) { TAG_LOGE(AAFwkTag::APPMGR, "Write data failed."); return; } diff --git a/interfaces/inner_api/app_manager/src/appmgr/start_specified_ability_response_stub.cpp b/interfaces/inner_api/app_manager/src/appmgr/start_specified_ability_response_stub.cpp index b0754c3a2e..690da42b84 100644 --- a/interfaces/inner_api/app_manager/src/appmgr/start_specified_ability_response_stub.cpp +++ b/interfaces/inner_api/app_manager/src/appmgr/start_specified_ability_response_stub.cpp @@ -37,42 +37,21 @@ int32_t StartSpecifiedAbilityResponseStub::HandleOnAcceptWantResponse(MessagePar int32_t StartSpecifiedAbilityResponseStub::HandleOnTimeoutResponse(MessageParcel &data, MessageParcel &reply) { - AAFwk::Want *want = data.ReadParcelable(); - if (want == nullptr) { - TAG_LOGE(AAFwkTag::APPMGR, "want is nullptr"); - return ERR_INVALID_VALUE; - } - - OnTimeoutResponse(*want, data.ReadInt32()); - delete want; + OnTimeoutResponse(data.ReadInt32()); return NO_ERROR; } int32_t StartSpecifiedAbilityResponseStub::HandleOnNewProcessRequestResponse(MessageParcel &data, MessageParcel &reply) { - AAFwk::Want *want = data.ReadParcelable(); - if (want == nullptr) { - TAG_LOGE(AAFwkTag::APPMGR, "want is nullptr"); - return ERR_INVALID_VALUE; - } - auto flag = Str16ToStr8(data.ReadString16()); - OnNewProcessRequestResponse(*want, flag, data.ReadInt32()); - delete want; + OnNewProcessRequestResponse(flag, data.ReadInt32()); return NO_ERROR; } int32_t StartSpecifiedAbilityResponseStub::HandleOnNewProcessRequestTimeoutResponse(MessageParcel &data, MessageParcel &reply) { - AAFwk::Want *want = data.ReadParcelable(); - if (want == nullptr) { - TAG_LOGE(AAFwkTag::APPMGR, "want is nullptr"); - return ERR_INVALID_VALUE; - } - - OnNewProcessRequestTimeoutResponse(*want, data.ReadInt32()); - delete want; + OnNewProcessRequestTimeoutResponse(data.ReadInt32()); return NO_ERROR; } diff --git a/services/abilitymgr/include/ability_manager_service.h b/services/abilitymgr/include/ability_manager_service.h index 6e61503695..54acda6a85 100644 --- a/services/abilitymgr/include/ability_manager_service.h +++ b/services/abilitymgr/include/ability_manager_service.h @@ -1156,12 +1156,11 @@ public: int32_t userId = DEFAULT_INVAL_VALUE, int requestCode = DEFAULT_INVAL_VALUE); - void OnAcceptWantResponse(const AAFwk::Want &want, const std::string &flag, int32_t requestId = 0); - void OnStartSpecifiedAbilityTimeoutResponse(const AAFwk::Want &want, int32_t requestId = 0); + void OnAcceptWantResponse(const AAFwk::Want &want, const std::string &flag, int32_t requestId); + void OnStartSpecifiedAbilityTimeoutResponse(int32_t requestId); - void OnStartSpecifiedProcessResponse(const AAFwk::Want &want, const std::string &flag, - int32_t requestId = 0); - void OnStartSpecifiedProcessTimeoutResponse(const AAFwk::Want &want, int32_t requestId = 0); + void OnStartSpecifiedProcessResponse(const std::string &flag, int32_t requestId = 0); + void OnStartSpecifiedProcessTimeoutResponse(int32_t requestId); void OnStartSpecifiedFailed(int32_t requestId); virtual int GetAbilityRunningInfos(std::vector &info) override; diff --git a/services/abilitymgr/include/app_scheduler.h b/services/abilitymgr/include/app_scheduler.h index f6ab9d7d79..06225771c7 100644 --- a/services/abilitymgr/include/app_scheduler.h +++ b/services/abilitymgr/include/app_scheduler.h @@ -129,11 +129,10 @@ public: virtual void OnAcceptWantResponse(const AAFwk::Want &want, const std::string &flag, int32_t requestId) override; - virtual void OnTimeoutResponse(const AAFwk::Want &want, int32_t requestId) override; + virtual void OnTimeoutResponse(int32_t requestId) override; - virtual void OnNewProcessRequestResponse(const AAFwk::Want &want, const std::string &flag, - int32_t requestId) override; - virtual void OnNewProcessRequestTimeoutResponse(const AAFwk::Want &want, int32_t requestId) override; + virtual void OnNewProcessRequestResponse(const std::string &flag, int32_t requestId) override; + virtual void OnNewProcessRequestTimeoutResponse(int32_t requestId) override; virtual void OnStartSpecifiedFailed(int32_t requestId) override; }; diff --git a/services/abilitymgr/include/mission/mission_list_manager.h b/services/abilitymgr/include/mission/mission_list_manager.h index dd0e2e0b2d..7b2201b36d 100644 --- a/services/abilitymgr/include/mission/mission_list_manager.h +++ b/services/abilitymgr/include/mission/mission_list_manager.h @@ -291,7 +291,7 @@ public: void OnAcceptWantResponse(const AAFwk::Want &want, const std::string &flag) override; - void OnStartSpecifiedAbilityTimeoutResponse(const AAFwk::Want &want) override; + void OnStartSpecifiedAbilityTimeoutResponse() override; /** * resolve the call ipc of ability for scheduling oncall. * diff --git a/services/abilitymgr/include/mission/mission_list_manager_interface.h b/services/abilitymgr/include/mission/mission_list_manager_interface.h index 8e49dc6f95..430ba13f38 100644 --- a/services/abilitymgr/include/mission/mission_list_manager_interface.h +++ b/services/abilitymgr/include/mission/mission_list_manager_interface.h @@ -81,7 +81,7 @@ public: virtual void DumpMission(int missionId, std::vector &info) = 0; virtual void DumpMissionInfos(std::vector &info) = 0; virtual void OnAcceptWantResponse(const AAFwk::Want &want, const std::string &flag) = 0; - virtual void OnStartSpecifiedAbilityTimeoutResponse(const AAFwk::Want &want) = 0; + virtual void OnStartSpecifiedAbilityTimeoutResponse() = 0; virtual int ResolveLocked(const AbilityRequest &abilityRequest) = 0; virtual int ReleaseCallLocked(const sptr &connect, diff --git a/services/abilitymgr/include/scene_board/ui_ability_lifecycle_manager.h b/services/abilitymgr/include/scene_board/ui_ability_lifecycle_manager.h index f1f99d94c0..f8e7125be6 100644 --- a/services/abilitymgr/include/scene_board/ui_ability_lifecycle_manager.h +++ b/services/abilitymgr/include/scene_board/ui_ability_lifecycle_manager.h @@ -208,29 +208,28 @@ public: * @param abilityRequest the flag of the ability to start. * @return Returns ERR_OK on success, others on failure. */ - void OnAcceptWantResponse(const AAFwk::Want &want, const std::string &flag, int32_t requestId = 0); + void OnAcceptWantResponse(const AAFwk::Want &want, const std::string &flag, int32_t requestId); /** * OnStartSpecifiedProcessResponse. * - * @param want the want of the ability to start. - * @param abilityRequest target ability request. + * @param requestId target ability requestId. */ - void OnStartSpecifiedProcessResponse(const AAFwk::Want &want, const std::string &flag, int32_t requestId = 0); + void OnStartSpecifiedProcessResponse(const std::string &flag, int32_t requestId); /** * OnStartSpecifiedAbilityTimeoutResponse. * - * @param want the want of the ability to start. + * @param requestId the requestId of the ability to start. */ - void OnStartSpecifiedAbilityTimeoutResponse(const AAFwk::Want &want, int32_t requestId = 0); + void OnStartSpecifiedAbilityTimeoutResponse(int32_t requestId); /** * OnStartSpecifiedProcessTimeoutResponse. * - * @param want the want of the ability to start. + * @param requestId the requestId of the ability to start. */ - void OnStartSpecifiedProcessTimeoutResponse(const AAFwk::Want &want, int32_t requestId = 0); + void OnStartSpecifiedProcessTimeoutResponse(int32_t requestId); /** * OnStartSpecifiedFailed. diff --git a/services/abilitymgr/src/ability_manager_service.cpp b/services/abilitymgr/src/ability_manager_service.cpp index 72acef4e2b..4fc4769869 100644 --- a/services/abilitymgr/src/ability_manager_service.cpp +++ b/services/abilitymgr/src/ability_manager_service.cpp @@ -6244,8 +6244,7 @@ int AbilityManagerService::AbilityTransitionDone(const sptr &toke std::string entry = "AbilityManagerService::AbilityTransitionDone; the end of background lifecycle."; FreezeUtil::GetInstance().AddLifecycleEvent(token, entry); } else if (targetState != AbilityState::INITIAL) { - std::string entry = "AbilityManagerService::AbilityTransitionDone; the end of foreground lifecycle." - " the end of foreground lifecycle."; + std::string entry = "AbilityManagerService::AbilityTransitionDone; the end of foreground lifecycle."; FreezeUtil::GetInstance().AddLifecycleEvent(token, entry); } @@ -8012,41 +8011,40 @@ void AbilityManagerService::OnAcceptWantResponse( missionListManager->OnAcceptWantResponse(want, flag); } -void AbilityManagerService::OnStartSpecifiedAbilityTimeoutResponse(const AAFwk::Want &want, int32_t requestId) +void AbilityManagerService::OnStartSpecifiedAbilityTimeoutResponse(int32_t requestId) { - TAG_LOGI(AAFwkTag::ABILITYMGR, "%{public}s", want.GetElement().GetURI().c_str()); + TAG_LOGI(AAFwkTag::ABILITYMGR, "OnStartSpecifiedAbilityTimeoutResponse %{public}d", requestId); if (Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { auto uiAbilityManager = GetCurrentUIAbilityManager(); CHECK_POINTER(uiAbilityManager); - uiAbilityManager->OnStartSpecifiedAbilityTimeoutResponse(want, requestId); + uiAbilityManager->OnStartSpecifiedAbilityTimeoutResponse(requestId); return; } auto missionListManager = GetCurrentMissionListManager(); if (!missionListManager) { return; } - missionListManager->OnStartSpecifiedAbilityTimeoutResponse(want); + missionListManager->OnStartSpecifiedAbilityTimeoutResponse(); } -void AbilityManagerService::OnStartSpecifiedProcessResponse(const AAFwk::Want &want, const std::string &flag, - int32_t requestId) +void AbilityManagerService::OnStartSpecifiedProcessResponse(const std::string &flag, int32_t requestId) { TAG_LOGD(AAFwkTag::ABILITYMGR, "flag = %{public}s", flag.c_str()); if (Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { auto uiAbilityManager = GetCurrentUIAbilityManager(); CHECK_POINTER(uiAbilityManager); - uiAbilityManager->OnStartSpecifiedProcessResponse(want, flag, requestId); + uiAbilityManager->OnStartSpecifiedProcessResponse(flag, requestId); return; } } -void AbilityManagerService::OnStartSpecifiedProcessTimeoutResponse(const AAFwk::Want &want, int32_t requestId) +void AbilityManagerService::OnStartSpecifiedProcessTimeoutResponse(int32_t requestId) { - TAG_LOGI(AAFwkTag::ABILITYMGR, "%{public}s", want.GetElement().GetURI().c_str()); + TAG_LOGI(AAFwkTag::ABILITYMGR, "OnStartSpecifiedProcessTimeoutResponse %{public}d", requestId); if (Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { auto uiAbilityManager = GetCurrentUIAbilityManager(); CHECK_POINTER(uiAbilityManager); - uiAbilityManager->OnStartSpecifiedAbilityTimeoutResponse(want, requestId); + uiAbilityManager->OnStartSpecifiedProcessTimeoutResponse(requestId); return; } } diff --git a/services/abilitymgr/src/app_scheduler.cpp b/services/abilitymgr/src/app_scheduler.cpp index 6454ac7439..1c2a6e36d3 100644 --- a/services/abilitymgr/src/app_scheduler.cpp +++ b/services/abilitymgr/src/app_scheduler.cpp @@ -393,9 +393,9 @@ void AppScheduler::PrepareTerminateApp(const pid_t pid, const std::string &modul IN_PROCESS_CALL_WITHOUT_RET(appMgrClient_->PrepareTerminateApp(pid, moduleName)); } -void StartSpecifiedAbilityResponse::OnTimeoutResponse(const AAFwk::Want &want, int32_t requestId) +void StartSpecifiedAbilityResponse::OnTimeoutResponse(int32_t requestId) { - DelayedSingleton::GetInstance()->OnStartSpecifiedAbilityTimeoutResponse(want, requestId); + DelayedSingleton::GetInstance()->OnStartSpecifiedAbilityTimeoutResponse(requestId); } void AppScheduler::StartSpecifiedProcess( @@ -405,15 +405,14 @@ void AppScheduler::StartSpecifiedProcess( IN_PROCESS_CALL_WITHOUT_RET(appMgrClient_->StartSpecifiedProcess(want, abilityInfo, requestId)); } -void StartSpecifiedAbilityResponse::OnNewProcessRequestResponse( - const AAFwk::Want &want, const std::string &flag, int32_t requestId) +void StartSpecifiedAbilityResponse::OnNewProcessRequestResponse(const std::string &flag, int32_t requestId) { - DelayedSingleton::GetInstance()->OnStartSpecifiedProcessResponse(want, flag, requestId); + DelayedSingleton::GetInstance()->OnStartSpecifiedProcessResponse(flag, requestId); } -void StartSpecifiedAbilityResponse::OnNewProcessRequestTimeoutResponse(const AAFwk::Want &want, int32_t requestId) +void StartSpecifiedAbilityResponse::OnNewProcessRequestTimeoutResponse(int32_t requestId) { - DelayedSingleton::GetInstance()->OnStartSpecifiedProcessTimeoutResponse(want, requestId); + DelayedSingleton::GetInstance()->OnStartSpecifiedProcessTimeoutResponse(requestId); } void StartSpecifiedAbilityResponse::OnStartSpecifiedFailed(int32_t requestId) diff --git a/services/abilitymgr/src/mission/mission_list_manager.cpp b/services/abilitymgr/src/mission/mission_list_manager.cpp index fb234a720a..b9965a8f83 100644 --- a/services/abilitymgr/src/mission/mission_list_manager.cpp +++ b/services/abilitymgr/src/mission/mission_list_manager.cpp @@ -3647,7 +3647,7 @@ void MissionListManager::NotifyStartSpecifiedAbility(AbilityRequest &abilityRequ } } -void MissionListManager::OnStartSpecifiedAbilityTimeoutResponse(const AAFwk::Want &want) +void MissionListManager::OnStartSpecifiedAbilityTimeoutResponse() { TAG_LOGD(AAFwkTag::ABILITYMGR, "called"); std::lock_guard guard(managerLock_); diff --git a/services/abilitymgr/src/scene_board/ui_ability_lifecycle_manager.cpp b/services/abilitymgr/src/scene_board/ui_ability_lifecycle_manager.cpp index e911034d31..255af5eab9 100644 --- a/services/abilitymgr/src/scene_board/ui_ability_lifecycle_manager.cpp +++ b/services/abilitymgr/src/scene_board/ui_ability_lifecycle_manager.cpp @@ -1957,7 +1957,7 @@ void UIAbilityLifecycleManager::HandleLegacyAcceptWantDone(AbilityRequest &abili StartAbilityBySpecifed(abilityRequest, callerAbility, requestId, flag); } -void UIAbilityLifecycleManager::OnStartSpecifiedAbilityTimeoutResponse(const AAFwk::Want &want, int32_t requestId) +void UIAbilityLifecycleManager::OnStartSpecifiedAbilityTimeoutResponse(int32_t requestId) { TAG_LOGI(AAFwkTag::ABILITYMGR, "SpecifiedAbilityTimeout %{public}d", requestId); OnStartSpecifiedFailed(requestId); @@ -1986,11 +1986,9 @@ void UIAbilityLifecycleManager::OnStartSpecifiedFailed(int32_t requestId) } } -void UIAbilityLifecycleManager::OnStartSpecifiedProcessResponse(const AAFwk::Want &want, const std::string &flag, - int32_t requestId) +void UIAbilityLifecycleManager::OnStartSpecifiedProcessResponse(const std::string &flag, int32_t requestId) { - TAG_LOGI(AAFwkTag::ABILITYMGR, "OnStartSpecifiedProcessResponse, %{public}d, %{public}s", - requestId, want.GetElement().GetURI().c_str()); + TAG_LOGI(AAFwkTag::ABILITYMGR, "OnStartSpecifiedProcessResponse, %{public}d", requestId); HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); std::lock_guard guard(sessionLock_); auto request = GetSpecifiedRequest(requestId); @@ -2024,7 +2022,7 @@ void UIAbilityLifecycleManager::OnStartSpecifiedProcessResponse(const AAFwk::Wan NotifySCBPendingActivation(sessionInfo, abilityRequest); } -void UIAbilityLifecycleManager::OnStartSpecifiedProcessTimeoutResponse(const AAFwk::Want &want, int32_t requestId) +void UIAbilityLifecycleManager::OnStartSpecifiedProcessTimeoutResponse(int32_t requestId) { TAG_LOGI(AAFwkTag::ABILITYMGR, "OnStartSpecifiedProcessTimeoutResponse %{public}d", requestId); std::lock_guard guard(sessionLock_); diff --git a/services/appmgr/src/app_mgr_service_inner.cpp b/services/appmgr/src/app_mgr_service_inner.cpp index a2c2db98f3..590d8bc32c 100644 --- a/services/appmgr/src/app_mgr_service_inner.cpp +++ b/services/appmgr/src/app_mgr_service_inner.cpp @@ -469,7 +469,7 @@ void AppMgrServiceInner::StartSpecifiedProcess(const AAFwk::Want &want, const Ap } TAG_LOGI(AAFwkTag::APPMGR, "main process do not exists."); if (startSpecifiedAbilityResponse_) { - startSpecifiedAbilityResponse_->OnNewProcessRequestResponse(want, "", requestId); + startSpecifiedAbilityResponse_->OnNewProcessRequestResponse("", requestId); } } @@ -4483,14 +4483,12 @@ void AppMgrServiceInner::HandleAddAbilityStageTimeOut(std::shared_ptrIsStartSpecifiedAbility() && startSpecifiedAbilityResponse_) { - startSpecifiedAbilityResponse_->OnTimeoutResponse(appRecord->GetSpecifiedWant(), - appRecord->GetSpecifiedRequestId()); + startSpecifiedAbilityResponse_->OnTimeoutResponse(appRecord->GetSpecifiedRequestId()); } appRecord->ResetSpecifiedRequest(); if (appRecord->IsNewProcessRequest() && startSpecifiedAbilityResponse_) { - startSpecifiedAbilityResponse_->OnNewProcessRequestTimeoutResponse(appRecord->GetNewProcessRequestWant(), - appRecord->GetNewProcessRequestId()); + startSpecifiedAbilityResponse_->OnNewProcessRequestTimeoutResponse(appRecord->GetNewProcessRequestId()); } appRecord->ResetNewProcessRequest(); @@ -5210,8 +5208,7 @@ void AppMgrServiceInner::HandleStartSpecifiedAbilityTimeOut(std::shared_ptrIsStartSpecifiedAbility() && startSpecifiedAbilityResponse_) { - startSpecifiedAbilityResponse_->OnTimeoutResponse(appRecord->GetSpecifiedWant(), - appRecord->GetSpecifiedRequestId()); + startSpecifiedAbilityResponse_->OnTimeoutResponse(appRecord->GetSpecifiedRequestId()); } appRecord->ResetSpecifiedRequest(); @@ -5233,7 +5230,7 @@ void AppMgrServiceInner::ScheduleNewProcessRequestDone( appRecord->ResetNewProcessRequest(); if (startSpecifiedAbilityResponse_) { - startSpecifiedAbilityResponse_->OnNewProcessRequestResponse(want, flag, requestId); + startSpecifiedAbilityResponse_->OnNewProcessRequestResponse(flag, requestId); } appRecord->ResetNewProcessRequest(); } @@ -5247,8 +5244,7 @@ void AppMgrServiceInner::HandleStartSpecifiedProcessTimeout(std::shared_ptrOnNewProcessRequestTimeoutResponse(appRecord->GetNewProcessRequestWant(), - appRecord->GetNewProcessRequestId()); + startSpecifiedAbilityResponse_->OnNewProcessRequestTimeoutResponse(appRecord->GetNewProcessRequestId()); } appRecord->ResetNewProcessRequest(); } diff --git a/services/appmgr/src/app_state_observer_manager.cpp b/services/appmgr/src/app_state_observer_manager.cpp index ef68a52d11..82dbe1af3c 100644 --- a/services/appmgr/src/app_state_observer_manager.cpp +++ b/services/appmgr/src/app_state_observer_manager.cpp @@ -1026,6 +1026,7 @@ void AppStateObserverManager::RemoveObserverDeathRecipient(const sptrsecond > OBSERVER_UID_COUNT_LOG) { TAG_LOGW(AAFwkTag::APPMGR, "too many observer uid: %{public}d, count: %{public}d", uid, it->second); } - observerAmount_++; if (observerAmount_ % OBSERVER_AMOUNT_COUNT_LOG == 0) { for (const auto &[uid, count] : observerCountMap_) { TAG_LOGW(AAFwkTag::APPMGR, "observer overview uid: %{public}d, count: %{public}d", uid, count); diff --git a/test/fuzztest/abilitymanagerservicefourth_fuzzer/abilitymanagerservicefourth_fuzzer.cpp b/test/fuzztest/abilitymanagerservicefourth_fuzzer/abilitymanagerservicefourth_fuzzer.cpp index 6211742e6e..61dd7800ee 100755 --- a/test/fuzztest/abilitymanagerservicefourth_fuzzer/abilitymanagerservicefourth_fuzzer.cpp +++ b/test/fuzztest/abilitymanagerservicefourth_fuzzer/abilitymanagerservicefourth_fuzzer.cpp @@ -68,8 +68,8 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) sptr callback; abilityms->StartUser(intParam, callback); abilityms->StopUser(intParam, callback); - abilityms->OnAcceptWantResponse(*want, stringParam); - abilityms->OnStartSpecifiedAbilityTimeoutResponse(*want); + abilityms->OnAcceptWantResponse(*want, stringParam, 0); + abilityms->OnStartSpecifiedAbilityTimeoutResponse(0); if (want) { delete want; want = nullptr; diff --git a/test/fuzztest/missionlistmanagerfirst_fuzzer/missionlistmanagerfirst_fuzzer.cpp b/test/fuzztest/missionlistmanagerfirst_fuzzer/missionlistmanagerfirst_fuzzer.cpp index 3bbd58052d..135b2c2dbb 100644 --- a/test/fuzztest/missionlistmanagerfirst_fuzzer/missionlistmanagerfirst_fuzzer.cpp +++ b/test/fuzztest/missionlistmanagerfirst_fuzzer/missionlistmanagerfirst_fuzzer.cpp @@ -267,7 +267,7 @@ void DoSomethingTestWithMyAPI4(std::shared_ptr missionListMg missionListMgr->OnAcceptWantResponse(want, stringParam); missionListMgr->EnqueueWaitingAbility(abilityRequest); missionListMgr->EnqueueWaitingAbility(abilityRequest); // add twice - missionListMgr->OnStartSpecifiedAbilityTimeoutResponse(want); + missionListMgr->OnStartSpecifiedAbilityTimeoutResponse(); missionListMgr->GetMissionBySpecifiedFlag(want, stringParam); } diff --git a/test/fuzztest/missionlistmanagersecond_fuzzer/missionlistmanagersecond_fuzzer.cpp b/test/fuzztest/missionlistmanagersecond_fuzzer/missionlistmanagersecond_fuzzer.cpp index 4de63bfafd..260f46d6f0 100644 --- a/test/fuzztest/missionlistmanagersecond_fuzzer/missionlistmanagersecond_fuzzer.cpp +++ b/test/fuzztest/missionlistmanagersecond_fuzzer/missionlistmanagersecond_fuzzer.cpp @@ -154,7 +154,7 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) std::shared_ptr callRecord; missionListManager->OnCallConnectDied(callRecord); missionListManager->OnAcceptWantResponse(*want, stringParam); - missionListManager->OnStartSpecifiedAbilityTimeoutResponse(*want); + missionListManager->OnStartSpecifiedAbilityTimeoutResponse(); missionListManager->GetMissionBySpecifiedFlag(*want, stringParam); missionListManager->IsReachToLimitLocked(); sptr snapshotHandler; diff --git a/test/fuzztest/uiabilitylifecyclemanagera_fuzzer/uiabilitylifecyclemanagera_fuzzer.cpp b/test/fuzztest/uiabilitylifecyclemanagera_fuzzer/uiabilitylifecyclemanagera_fuzzer.cpp index f2bcef5292..a2bd21128b 100644 --- a/test/fuzztest/uiabilitylifecyclemanagera_fuzzer/uiabilitylifecyclemanagera_fuzzer.cpp +++ b/test/fuzztest/uiabilitylifecyclemanagera_fuzzer/uiabilitylifecyclemanagera_fuzzer.cpp @@ -71,9 +71,9 @@ void DoSomethingInterestingWithMyAPI1(const char *data, size_t size) int32_t int32Param = static_cast(GetU32Data(data)); uint32_t requestId = static_cast(GetU32Data(data)); uIAbilityLifecycleManager->OnAcceptWantResponse(want1, strParam, requestId); - uIAbilityLifecycleManager->OnStartSpecifiedProcessResponse(want1, strParam, requestId); - uIAbilityLifecycleManager->OnStartSpecifiedAbilityTimeoutResponse(want1, requestId); - uIAbilityLifecycleManager->OnStartSpecifiedProcessTimeoutResponse(want1, requestId); + uIAbilityLifecycleManager->OnStartSpecifiedProcessResponse(strParam, requestId); + uIAbilityLifecycleManager->OnStartSpecifiedAbilityTimeoutResponse(requestId); + uIAbilityLifecycleManager->OnStartSpecifiedProcessTimeoutResponse(requestId); uIAbilityLifecycleManager->StartSpecifiedAbilityBySCB(want1); sptr callStub; std::shared_ptr abilityRecord4; diff --git a/test/moduletest/common/ams/specified_ability_service_test/specified_ability_service_test.cpp b/test/moduletest/common/ams/specified_ability_service_test/specified_ability_service_test.cpp index c1b7a6b732..2c746036a4 100644 --- a/test/moduletest/common/ams/specified_ability_service_test/specified_ability_service_test.cpp +++ b/test/moduletest/common/ams/specified_ability_service_test/specified_ability_service_test.cpp @@ -121,7 +121,7 @@ HWTEST_F(SpecifiedAbilityServiceTest, OnAcceptWantResponse_001, TestSize.Level1) } else { abilityMgrServ_->subManagersHelper_->InitSubManagers(11, true); } - abilityMgrServ_->OnAcceptWantResponse(want, "flag"); + abilityMgrServ_->OnAcceptWantResponse(want, "flag", 0); EXPECT_EQ(false, abilityRecord->IsNewWant()); } diff --git a/test/unittest/ability_manager_service_third_test/ability_manager_service_third_test.cpp b/test/unittest/ability_manager_service_third_test/ability_manager_service_third_test.cpp index e22b73a0f4..d9ab12d518 100644 --- a/test/unittest/ability_manager_service_third_test/ability_manager_service_third_test.cpp +++ b/test/unittest/ability_manager_service_third_test/ability_manager_service_third_test.cpp @@ -426,11 +426,11 @@ HWTEST_F(AbilityManagerServiceThirdTest, OnAcceptWantResponse_001, TestSize.Leve abilityMs_->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); AAFwk::Want want; ASSERT_NE(abilityMs_, nullptr); - abilityMs_->OnAcceptWantResponse(want, "test"); + abilityMs_->OnAcceptWantResponse(want, "test", 0); auto temp = abilityMs_->subManagersHelper_->currentMissionListManager_; abilityMs_->subManagersHelper_->currentMissionListManager_.reset(); - abilityMs_->OnAcceptWantResponse(want, "test"); + abilityMs_->OnAcceptWantResponse(want, "test", 0); abilityMs_->subManagersHelper_->currentMissionListManager_ = temp; TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceThirdTest OnAcceptWantResponse_001 end"); } @@ -446,13 +446,12 @@ HWTEST_F(AbilityManagerServiceThirdTest, OnStartSpecifiedAbilityTimeoutResponse_ TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceThirdTest OnStartSpecifiedAbilityTimeoutResponse_001 start"); auto abilityMs_ = std::make_shared(); abilityMs_->subManagersHelper_ = std::make_shared(nullptr, nullptr); - AAFwk::Want want; ASSERT_NE(abilityMs_, nullptr); - abilityMs_->OnStartSpecifiedAbilityTimeoutResponse(want); + abilityMs_->OnStartSpecifiedAbilityTimeoutResponse(0); auto temp = abilityMs_->subManagersHelper_->currentMissionListManager_; abilityMs_->subManagersHelper_->currentMissionListManager_.reset(); - abilityMs_->OnStartSpecifiedAbilityTimeoutResponse(want); + abilityMs_->OnStartSpecifiedAbilityTimeoutResponse(0); abilityMs_->subManagersHelper_->currentMissionListManager_ = temp; TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceThirdTest OnStartSpecifiedAbilityTimeoutResponse_001 end"); } diff --git a/test/unittest/mission_list_manager_test/mission_list_manager_test.cpp b/test/unittest/mission_list_manager_test/mission_list_manager_test.cpp index 317be4d075..05cbf12381 100644 --- a/test/unittest/mission_list_manager_test/mission_list_manager_test.cpp +++ b/test/unittest/mission_list_manager_test/mission_list_manager_test.cpp @@ -6459,7 +6459,7 @@ HWTEST_F(MissionListManagerTest, OnStartSpecifiedAbilityTimeoutResponse_001, Tes auto missionListManager = std::make_shared(userId); EXPECT_NE(missionListManager, nullptr); Want want; - missionListManager->OnStartSpecifiedAbilityTimeoutResponse(want); + missionListManager->OnStartSpecifiedAbilityTimeoutResponse(); } /* @@ -6475,10 +6475,9 @@ HWTEST_F(MissionListManagerTest, OnStartSpecifiedAbilityTimeoutResponse_002, Tes constexpr int32_t userId = 3; auto missionListManager = std::make_shared(userId); EXPECT_NE(missionListManager, nullptr); - Want want; AbilityRequest abilityRequest; missionListManager->waitingAbilityQueue_.push(abilityRequest); - missionListManager->OnStartSpecifiedAbilityTimeoutResponse(want); + missionListManager->OnStartSpecifiedAbilityTimeoutResponse(); } /* @@ -6494,15 +6493,14 @@ HWTEST_F(MissionListManagerTest, OnStartSpecifiedAbilityTimeoutResponse_003, Tes constexpr int32_t userId = 3; auto missionListManager = std::make_shared(userId); EXPECT_NE(missionListManager, nullptr); - Want want; AbilityRequest abilityRequest1; AbilityRequest abilityRequest2; abilityRequest1.abilityInfo.launchMode = AppExecFwk::LaunchMode::SPECIFIED; abilityRequest1.abilityInfo.visible = false; missionListManager->waitingAbilityQueue_.push(abilityRequest1); - missionListManager->OnStartSpecifiedAbilityTimeoutResponse(want); + missionListManager->OnStartSpecifiedAbilityTimeoutResponse(); missionListManager->waitingAbilityQueue_.push(abilityRequest2); - missionListManager->OnStartSpecifiedAbilityTimeoutResponse(want); + missionListManager->OnStartSpecifiedAbilityTimeoutResponse(); } /* @@ -6518,15 +6516,14 @@ HWTEST_F(MissionListManagerTest, OnStartSpecifiedAbilityTimeoutResponse_004, Tes constexpr int32_t userId = 3; auto missionListManager = std::make_shared(userId); EXPECT_NE(missionListManager, nullptr); - Want want; AbilityRequest abilityRequest1; AbilityRequest abilityRequest2; abilityRequest1.abilityInfo.launchMode = AppExecFwk::LaunchMode::SPECIFIED; abilityRequest1.abilityInfo.visible = true; missionListManager->waitingAbilityQueue_.push(abilityRequest1); - missionListManager->OnStartSpecifiedAbilityTimeoutResponse(want); + missionListManager->OnStartSpecifiedAbilityTimeoutResponse(); missionListManager->waitingAbilityQueue_.push(abilityRequest2); - missionListManager->OnStartSpecifiedAbilityTimeoutResponse(want); + missionListManager->OnStartSpecifiedAbilityTimeoutResponse(); } /* @@ -6542,15 +6539,14 @@ HWTEST_F(MissionListManagerTest, OnStartSpecifiedAbilityTimeoutResponse_005, Tes constexpr int32_t userId = 3; auto missionListManager = std::make_shared(userId); EXPECT_NE(missionListManager, nullptr); - Want want; AbilityRequest abilityRequest1; AbilityRequest abilityRequest2; abilityRequest1.abilityInfo.launchMode = AppExecFwk::LaunchMode::SINGLETON; abilityRequest1.abilityInfo.visible = true; missionListManager->waitingAbilityQueue_.push(abilityRequest1); - missionListManager->OnStartSpecifiedAbilityTimeoutResponse(want); + missionListManager->OnStartSpecifiedAbilityTimeoutResponse(); missionListManager->waitingAbilityQueue_.push(abilityRequest2); - missionListManager->OnStartSpecifiedAbilityTimeoutResponse(want); + missionListManager->OnStartSpecifiedAbilityTimeoutResponse(); } /* diff --git a/test/unittest/ui_ability_lifecycle_manager_test/ui_ability_lifecycle_manager_test.cpp b/test/unittest/ui_ability_lifecycle_manager_test/ui_ability_lifecycle_manager_test.cpp index a4e2466f60..66ba2e894a 100644 --- a/test/unittest/ui_ability_lifecycle_manager_test/ui_ability_lifecycle_manager_test.cpp +++ b/test/unittest/ui_ability_lifecycle_manager_test/ui_ability_lifecycle_manager_test.cpp @@ -2250,15 +2250,15 @@ HWTEST_F(UIAbilityLifecycleManagerTest, OnAcceptWantResponse_001, TestSize.Level EXPECT_NE(uiAbilityLifecycleManager, nullptr); Want want; std::string flag = "flag"; - uiAbilityLifecycleManager->OnAcceptWantResponse(want, flag); + uiAbilityLifecycleManager->OnAcceptWantResponse(want, flag, 0); AbilityRequest abilityRequest; - uiAbilityLifecycleManager->OnAcceptWantResponse(want, flag); + uiAbilityLifecycleManager->OnAcceptWantResponse(want, flag, 0); abilityRequest.abilityInfo.launchMode = AppExecFwk::LaunchMode::SPECIFIED; - uiAbilityLifecycleManager->OnAcceptWantResponse(want, flag); + uiAbilityLifecycleManager->OnAcceptWantResponse(want, flag, 0); - uiAbilityLifecycleManager->OnAcceptWantResponse(want, ""); + uiAbilityLifecycleManager->OnAcceptWantResponse(want, "", 0); uiAbilityLifecycleManager.reset(); } @@ -2289,11 +2289,11 @@ HWTEST_F(UIAbilityLifecycleManagerTest, OnAcceptWantResponse_002, TestSize.Level abilityRecord->SetAppIndex(1); abilityRecord->SetSpecifiedFlag(flag); uiAbilityLifecycleManager->sessionAbilityMap_.emplace(1, abilityRecord); - uiAbilityLifecycleManager->OnAcceptWantResponse(want, flag); + uiAbilityLifecycleManager->OnAcceptWantResponse(want, flag, 0); std::shared_ptr callerAbility = InitAbilityRecord(); abilityRequest.callerToken = callerAbility->GetToken()->AsObject(); - uiAbilityLifecycleManager->OnAcceptWantResponse(want, flag); + uiAbilityLifecycleManager->OnAcceptWantResponse(want, flag, 0); uiAbilityLifecycleManager.reset(); } #endif // WITH_DLP @@ -2657,9 +2657,8 @@ HWTEST_F(UIAbilityLifecycleManagerTest, OnStartSpecifiedProcessResponse_001, Tes { auto uiAbilityLifecycleManager = std::make_shared(); EXPECT_NE(uiAbilityLifecycleManager, nullptr); - Want want; std::string flag = "flag"; - uiAbilityLifecycleManager->OnStartSpecifiedProcessResponse(want, flag); + uiAbilityLifecycleManager->OnStartSpecifiedProcessResponse(flag, 0); uiAbilityLifecycleManager.reset(); } @@ -2672,10 +2671,9 @@ HWTEST_F(UIAbilityLifecycleManagerTest, OnStartSpecifiedProcessResponse_002, Tes { auto uiAbilityLifecycleManager = std::make_shared(); EXPECT_NE(uiAbilityLifecycleManager, nullptr); - Want want; std::string flag = "flag"; int32_t requestId = 100; - uiAbilityLifecycleManager->OnStartSpecifiedProcessResponse(want, flag, requestId); + uiAbilityLifecycleManager->OnStartSpecifiedProcessResponse(flag, requestId); uiAbilityLifecycleManager.reset(); } @@ -2688,8 +2686,7 @@ HWTEST_F(UIAbilityLifecycleManagerTest, OnStartSpecifiedAbilityTimeoutResponse_0 { auto uiAbilityLifecycleManager = std::make_shared(); EXPECT_NE(uiAbilityLifecycleManager, nullptr); - Want want; - uiAbilityLifecycleManager->OnStartSpecifiedAbilityTimeoutResponse(want); + uiAbilityLifecycleManager->OnStartSpecifiedAbilityTimeoutResponse(0); uiAbilityLifecycleManager.reset(); } @@ -2702,9 +2699,8 @@ HWTEST_F(UIAbilityLifecycleManagerTest, OnStartSpecifiedAbilityTimeoutResponse_0 { auto uiAbilityLifecycleManager = std::make_shared(); EXPECT_NE(uiAbilityLifecycleManager, nullptr); - Want want; int32_t requestId = 100; - uiAbilityLifecycleManager->OnStartSpecifiedAbilityTimeoutResponse(want, requestId); + uiAbilityLifecycleManager->OnStartSpecifiedAbilityTimeoutResponse(requestId); uiAbilityLifecycleManager.reset(); } @@ -2736,8 +2732,7 @@ HWTEST_F(UIAbilityLifecycleManagerTest, OnStartSpecifiedProcessTimeoutResponse_0 { auto uiAbilityLifecycleManager = std::make_shared(); EXPECT_NE(uiAbilityLifecycleManager, nullptr); - Want want; - uiAbilityLifecycleManager->OnStartSpecifiedProcessTimeoutResponse(want); + uiAbilityLifecycleManager->OnStartSpecifiedProcessTimeoutResponse(0); uiAbilityLifecycleManager.reset(); } @@ -2750,9 +2745,8 @@ HWTEST_F(UIAbilityLifecycleManagerTest, OnStartSpecifiedProcessTimeoutResponse_0 { auto uiAbilityLifecycleManager = std::make_shared(); EXPECT_NE(uiAbilityLifecycleManager, nullptr); - Want want; int32_t requestId = 100; - uiAbilityLifecycleManager->OnStartSpecifiedProcessTimeoutResponse(want, requestId); + uiAbilityLifecycleManager->OnStartSpecifiedProcessTimeoutResponse(requestId); uiAbilityLifecycleManager.reset(); }