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

!13144 Code review

Browse Source 
Merge pull request !13144 from wangzhen/codefix
This commit is contained in:
oh_ci
2025-03-15 06:45:24 +00:00
committed by Gitee
parent 3ff2600897 3d1e777e75
commit bcfd878e2c
23 changed files with 95 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files
interfaces/inner_api/app_manager/include/appmgr/istart_specified_ability_response.h
+3 -5
View File
@@ -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) {};
interfaces/inner_api/app_manager/include/appmgr/start_specified_ability_response_proxy.h
+3 -5
View File
@@ -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;
interfaces/inner_api/app_manager/src/appmgr/start_specified_ability_response_proxy.cpp
+10 -13
View File
@@ -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;
}
interfaces/inner_api/app_manager/src/appmgr/start_specified_ability_response_stub.cpp
+3 -24
View File
@@ -37,42 +37,21 @@ int32_t StartSpecifiedAbilityResponseStub::HandleOnAcceptWantResponse(MessagePar
int32_t StartSpecifiedAbilityResponseStub::HandleOnTimeoutResponse(MessageParcel &data, MessageParcel &reply)
{
AAFwk::Want *want = data.ReadParcelable<AAFwk::Want>();
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<AAFwk::Want>();
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<AAFwk::Want>();
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;
}
services/abilitymgr/include/ability_manager_service.h
+4 -5
View File
@@ -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<AbilityRunningInfo> &info) override;
services/abilitymgr/include/app_scheduler.h
+3 -4
View File
@@ -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;
};
services/abilitymgr/include/mission/mission_list_manager.h
+1 -1
View File
@@ -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.
*
services/abilitymgr/include/mission/mission_list_manager_interface.h
+1 -1
View File
@@ -81,7 +81,7 @@ public:
virtual void DumpMission(int missionId, std::vector<std::string> &info) = 0;
virtual void DumpMissionInfos(std::vector<std::string> &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<IAbilityConnection> &connect,
services/abilitymgr/include/scene_board/ui_ability_lifecycle_manager.h
+7 -8
View File
@@ -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.
services/abilitymgr/src/ability_manager_service.cpp
+10 -12
View File
@@ -6244,8 +6244,7 @@ int AbilityManagerService::AbilityTransitionDone(const sptr<IRemoteObject> &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;
}
}
services/abilitymgr/src/app_scheduler.cpp
+6 -7
View File
@@ -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<AbilityManagerService>::GetInstance()->OnStartSpecifiedAbilityTimeoutResponse(want, requestId);
DelayedSingleton<AbilityManagerService>::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<AbilityManagerService>::GetInstance()->OnStartSpecifiedProcessResponse(want, flag, requestId);
DelayedSingleton<AbilityManagerService>::GetInstance()->OnStartSpecifiedProcessResponse(flag, requestId);
}
void StartSpecifiedAbilityResponse::OnNewProcessRequestTimeoutResponse(const AAFwk::Want &want, int32_t requestId)
void StartSpecifiedAbilityResponse::OnNewProcessRequestTimeoutResponse(int32_t requestId)
{
DelayedSingleton<AbilityManagerService>::GetInstance()->OnStartSpecifiedProcessTimeoutResponse(want, requestId);
DelayedSingleton<AbilityManagerService>::GetInstance()->OnStartSpecifiedProcessTimeoutResponse(requestId);
}
void StartSpecifiedAbilityResponse::OnStartSpecifiedFailed(int32_t requestId)
services/abilitymgr/src/mission/mission_list_manager.cpp
+1 -1
View File
@@ -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_);
services/abilitymgr/src/scene_board/ui_ability_lifecycle_manager.cpp
+4 -6
View File
@@ -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_);
services/appmgr/src/app_mgr_service_inner.cpp
+6 -10
View File
@@ -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_ptr<AppRunning
}
if (appRecord->IsStartSpecifiedAbility() && 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_ptr<AppR
}
if (appRecord->IsStartSpecifiedAbility() && 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_ptr<AppR
}
if (startSpecifiedAbilityResponse_) {
startSpecifiedAbilityResponse_->OnNewProcessRequestTimeoutResponse(appRecord->GetNewProcessRequestWant(),
appRecord->GetNewProcessRequestId());
startSpecifiedAbilityResponse_->OnNewProcessRequestTimeoutResponse(appRecord->GetNewProcessRequestId());
}
appRecord->ResetNewProcessRequest();
}
services/appmgr/src/app_state_observer_manager.cpp
+1 -1
View File
@@ -1026,6 +1026,7 @@ void AppStateObserverManager::RemoveObserverDeathRecipient(const sptr<IRemoteBro
void AppStateObserverManager::AddObserverCount(int32_t uid)
{
std::lock_guard lock(observerCountMapMutex_);
observerAmount_++;
auto it = observerCountMap_.find(uid);
if (it == observerCountMap_.end()) {
observerCountMap_.emplace(uid, 1);
@@ -1034,7 +1035,6 @@ void AppStateObserverManager::AddObserverCount(int32_t uid)
if (it->second > 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);
test/fuzztest/abilitymanagerservicefourth_fuzzer/abilitymanagerservicefourth_fuzzer.cpp
+2 -2
View File
@@ -68,8 +68,8 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size)
sptr<IUserCallback> 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;
test/fuzztest/missionlistmanagerfirst_fuzzer/missionlistmanagerfirst_fuzzer.cpp
+1 -1
View File
@@ -267,7 +267,7 @@ void DoSomethingTestWithMyAPI4(std::shared_ptr<MissionListManager> missionListMg
missionListMgr->OnAcceptWantResponse(want, stringParam);
missionListMgr->EnqueueWaitingAbility(abilityRequest);
missionListMgr->EnqueueWaitingAbility(abilityRequest); // add twice
missionListMgr->OnStartSpecifiedAbilityTimeoutResponse(want);
missionListMgr->OnStartSpecifiedAbilityTimeoutResponse();
missionListMgr->GetMissionBySpecifiedFlag(want, stringParam);
}
test/fuzztest/missionlistmanagersecond_fuzzer/missionlistmanagersecond_fuzzer.cpp
+1 -1
View File
@@ -154,7 +154,7 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size)
std::shared_ptr<CallRecord> callRecord;
missionListManager->OnCallConnectDied(callRecord);
missionListManager->OnAcceptWantResponse(*want, stringParam);
missionListManager->OnStartSpecifiedAbilityTimeoutResponse(*want);
missionListManager->OnStartSpecifiedAbilityTimeoutResponse();
missionListManager->GetMissionBySpecifiedFlag(*want, stringParam);
missionListManager->IsReachToLimitLocked();
sptr<ISnapshotHandler> snapshotHandler;
test/fuzztest/uiabilitylifecyclemanagera_fuzzer/uiabilitylifecyclemanagera_fuzzer.cpp
+3 -3
View File
@@ -71,9 +71,9 @@ void DoSomethingInterestingWithMyAPI1(const char *data, size_t size)
int32_t int32Param = static_cast<int32_t>(GetU32Data(data));
uint32_t requestId = static_cast<uint32_t>(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<IRemoteObject> callStub;
std::shared_ptr<AbilityRecord> abilityRecord4;
test/moduletest/common/ams/specified_ability_service_test/specified_ability_service_test.cpp
+1 -1
View File
@@ -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());
}
test/unittest/ability_manager_service_third_test/ability_manager_service_third_test.cpp
+4 -5
View File
@@ -426,11 +426,11 @@ HWTEST_F(AbilityManagerServiceThirdTest, OnAcceptWantResponse_001, TestSize.Leve
abilityMs_->subManagersHelper_->currentUIAbilityManager_ = std::make_shared<UIAbilityLifecycleManager>();
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<AbilityManagerService>();
abilityMs_->subManagersHelper_ = std::make_shared<SubManagersHelper>(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");
}
test/unittest/mission_list_manager_test/mission_list_manager_test.cpp
+8 -12
View File
@@ -6459,7 +6459,7 @@ HWTEST_F(MissionListManagerTest, OnStartSpecifiedAbilityTimeoutResponse_001, Tes
auto missionListManager = std::make_shared<MissionListManager>(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<MissionListManager>(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<MissionListManager>(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<MissionListManager>(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<MissionListManager>(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();
}
/*
test/unittest/ui_ability_lifecycle_manager_test/ui_ability_lifecycle_manager_test.cpp
+12 -18
View File
@@ -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<AbilityRecord> 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<UIAbilityLifecycleManager>();
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<UIAbilityLifecycleManager>();
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<UIAbilityLifecycleManager>();
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<UIAbilityLifecycleManager>();
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<UIAbilityLifecycleManager>();
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<UIAbilityLifecycleManager>();
EXPECT_NE(uiAbilityLifecycleManager, nullptr);
Want want;
int32_t requestId = 100;
uiAbilityLifecycleManager->OnStartSpecifiedProcessTimeoutResponse(want, requestId);
uiAbilityLifecycleManager->OnStartSpecifiedProcessTimeoutResponse(requestId);
uiAbilityLifecycleManager.reset();
}