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

东湖_退后台传入isFromScreenOffBackground_

Browse Source 
Signed-off-by: lidongrui <lidongrui3@huawei.com>
Co-Authored-By: Agent
This commit is contained in:
DESKTOP-UGVMD4B\DawnComing
2026-07-07 22:38:11 +08:00
parent 1881568cc1
commit 2d22e7eb07
8 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
interfaces/inner_api/ability_manager/include/iability_manager_collaborator.h
+3 -1
View File
@@ -99,9 +99,11 @@ public:
* @brief Notify when notify app to background.
* @param missionId missionId.
* @param userId, the user id.
* @param isFromScreenOffBackground whether the background is caused by screen off.
* @return 0 when notify move mission to background success or else failed.
*/
virtual int32_t NotifyMoveMissionToBackground(int32_t missionId, int32_t userId = CURRENT_USER_ID) = 0;
virtual int32_t NotifyMoveMissionToBackground(int32_t missionId, int32_t userId = CURRENT_USER_ID,
bool isFromScreenOffBackground = false) = 0;
/**
* @brief Notify when notify app to foreground.
services/abilitymgr/include/ability_manager_collaborator_proxy.h
+3 -1
View File
@@ -83,9 +83,11 @@ public:
* @brief Notify when notify app to background.
* @param missionId missionId.
* @param userId, the user id.
* @param isFromScreenOffBackground whether the background is caused by screen off.
* @return 0 when notify move mission to background success or else failed.
*/
virtual int32_t NotifyMoveMissionToBackground(int32_t missionId, int32_t userId = CURRENT_USER_ID) override;
virtual int32_t NotifyMoveMissionToBackground(int32_t missionId, int32_t userId = CURRENT_USER_ID,
bool isFromScreenOffBackground = false) override;
/**
* @brief Notify when notify app to foreground.
services/abilitymgr/src/ability_manager_collaborator_proxy.cpp
+6 -1
View File
@@ -200,7 +200,8 @@ int32_t AbilityManagerCollaboratorProxy::NotifyLoadAbility(
return NO_ERROR;
}
int32_t AbilityManagerCollaboratorProxy::NotifyMoveMissionToBackground(int32_t missionId, int32_t userId)
int32_t AbilityManagerCollaboratorProxy::NotifyMoveMissionToBackground(int32_t missionId, int32_t userId,
bool isFromScreenOffBackground)
{
MessageParcel data;
MessageParcel reply;
@@ -218,6 +219,10 @@ int32_t AbilityManagerCollaboratorProxy::NotifyMoveMissionToBackground(int32_t m
TAG_LOGE(AAFwkTag::ABILITYMGR, "userId write fail");
return ERR_INVALID_OPERATION;
}
if (!data.WriteBool(isFromScreenOffBackground)) {
TAG_LOGE(AAFwkTag::ABILITYMGR, "isFromScreenOffBackground write fail");
return ERR_INVALID_OPERATION;
}
int32_t ret = SendTransactCmd(
IAbilityManagerCollaborator::NOTIFY_MOVE_MISSION_TO_BACKGROUND, data, reply, option);
if (ret != NO_ERROR) {
services/abilitymgr/src/ability_record.cpp
+4 -2
View File
@@ -1003,7 +1003,8 @@ void AbilityRecord::SetAbilityStateInner(AbilityState state)
int32_t persistentId = sessionInfo->persistentId;
switch (state) {
case AbilityState::BACKGROUNDING: {
ret = collaborator->NotifyMoveMissionToBackground(persistentId, GetOwnerMissionUserId());
ret = collaborator->NotifyMoveMissionToBackground(persistentId, GetOwnerMissionUserId(),
isFromScreenOffBackground_);
break;
}
case AbilityState::TERMINATING: {
@@ -1024,7 +1025,8 @@ void AbilityRecord::SetAbilityStateInner(AbilityState state)
break;
}
case AbilityState::BACKGROUNDING: {
ret = collaborator->NotifyMoveMissionToBackground(missionId_, GetOwnerMissionUserId());
ret = collaborator->NotifyMoveMissionToBackground(missionId_, GetOwnerMissionUserId(),
isFromScreenOffBackground_);
break;
}
case AbilityState::TERMINATING: {
test/mock/ability_manager_collaborator/mock_ability_manager_collaborator.h
+2 -1
View File
@@ -32,7 +32,8 @@ public:
const Want &want));
MOCK_METHOD2(NotifyLoadAbility, int32_t(const AppExecFwk::AbilityInfo &abilityInfo,
const sptr<SessionInfo> &sessionInfo));
MOCK_METHOD2(NotifyMoveMissionToBackground, int32_t(int32_t missionId, int32_t userId));
MOCK_METHOD3(NotifyMoveMissionToBackground, int32_t(int32_t missionId, int32_t userId,
bool isFromScreenOffBackground));
MOCK_METHOD2(NotifyMoveMissionToForeground, int32_t(int32_t missionId, int32_t userId));
MOCK_METHOD2(NotifyTerminateMission, int32_t(int32_t missionId, int32_t userId));
MOCK_METHOD2(NotifyClearMission, int32_t(int32_t missionId, int32_t userId));
test/unittest/ability_manager_collaborator_proxy_test/ability_manager_collaborator_proxy_test.cpp
+2 -1
View File
@@ -133,7 +133,8 @@ HWTEST_F(AbilityManagerCollaboratorProxyTest, NotifyMoveMissionToBackground_0100
.WillOnce(Invoke(mock_.GetRefPtr(), &AbilityManagerCollaboratorStubMock::InvokeSendRequest));
int32_t missionId = 0;
int32_t userId = 100;
int32_t res = proxy_->NotifyMoveMissionToBackground(missionId, userId);
bool isFromScreenOffBackground = false;
int32_t res = proxy_->NotifyMoveMissionToBackground(missionId, userId, isFromScreenOffBackground);
EXPECT_EQ(res, NO_ERROR);
EXPECT_EQ(static_cast<uint32_t>(IAbilityManagerCollaborator::NOTIFY_MOVE_MISSION_TO_BACKGROUND), mock_->GetCode());
}
test/unittest/ability_manager_collaborator_proxy_test/ability_manager_collaborator_stub_mock.h
+1 -1
View File
@@ -59,7 +59,7 @@ public:
return 0;
}
int32_t NotifyMoveMissionToBackground(int32_t missionId, int32_t userId)
int32_t NotifyMoveMissionToBackground(int32_t missionId, int32_t userId, bool isFromScreenOffBackground)
{
return 0;
}
test/unittest/ability_manager_proxy_second_test/ability_manager_proxy_second_test.cpp
+2 -1
View File
@@ -94,7 +94,8 @@ public:
const Want &want));
MOCK_METHOD2(NotifyLoadAbility, int32_t(const AppExecFwk::AbilityInfo &abilityInfo,
const sptr<SessionInfo> &sessionInfo));
MOCK_METHOD2(NotifyMoveMissionToBackground, int32_t(int32_t missionId, int32_t userId));
MOCK_METHOD3(NotifyMoveMissionToBackground, int32_t(int32_t missionId, int32_t userId,
bool isFromScreenOffBackground));
MOCK_METHOD2(NotifyMoveMissionToForeground, int32_t(int32_t missionId, int32_t userId));
MOCK_METHOD2(NotifyTerminateMission, int32_t(int32_t missionId, int32_t userId));
MOCK_METHOD2(NotifyClearMission, int32_t(int32_t missionId, int32_t userId));