openharmony/ability_ability_runtime
1
0
Fork 0
mirror of https://gitee.com/openharmony/ability_ability_runtime synced 2024-11-23 15:20:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!719 去掉int类型入参的const属性

Browse Source 
Merge pull request !719 from wangdongdong/0207
This commit is contained in:
openharmony_ci 2022-02-14 11:33:15 +00:00 committed by Gitee
commit 12cec00f54
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
33 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frameworks/kits/ability/ability_runtime/test/mock/AMS/mock_serviceability_manager_service.h
View File

@ -117,7 +117,7 @@ public:
MOCK_METHOD1(GetPendinTerminateAbilityTestgRequestWant, void(int id));
MOCK_METHOD1(GetSystemMemoryAttr, void(AppExecFwk::SystemMemoryAttr &memoryInfo));
MOCK_METHOD3(StartContinuation, int(const Want &want, const sptr<IRemoteObject> &abilityToken, int32_t status));
MOCK_METHOD2(NotifyContinuationResult, int(int32_t missionId, const int32_t result));
MOCK_METHOD2(NotifyContinuationResult, int(int32_t missionId, int32_t result));
MOCK_METHOD1(LockMissionForCleanup, int(int32_t missionId));
MOCK_METHOD1(UnlockMissionForCleanup, int(int32_t missionId));

2
frameworks/kits/ability/native/include/ability_impl.h
View File

@ -349,7 +349,7 @@ public:
*
* @return
*/
virtual void NotifyContinuationResult(const int32_t result);
virtual void NotifyContinuationResult(int32_t result);
bool IsStageBasedModel() const;

2
frameworks/kits/ability/native/include/ability_thread.h
View File

@ -313,7 +313,7 @@ public:
*
* @param result: Continuation result
*/
void NotifyContinuationResult(const int32_t result);
void NotifyContinuationResult(int32_t result);
/**
* @brief Converts the given uri that refer to the Data ability into a normalized URI. A normalized URI can be used

2
frameworks/kits/ability/native/src/ability_impl.cpp
View File

@ -918,7 +918,7 @@ void AbilityImpl::ContinueAbility(const std::string& deviceId)
ability_->ContinueAbilityWithStack(deviceId);
}
void AbilityImpl::NotifyContinuationResult(const int32_t result)
void AbilityImpl::NotifyContinuationResult(int32_t result)
{
if (ability_ == nullptr) {
APP_LOGE("AbilityImpl::NotifyContinuationResult ability_ is nullptr");

2
frameworks/kits/ability/native/src/ability_thread.cpp
View File

@ -1212,7 +1212,7 @@ void AbilityThread::ContinueAbility(const std::string& deviceId)
abilityImpl_->ContinueAbility(deviceId);
}
void AbilityThread::NotifyContinuationResult(const int32_t result)
void AbilityThread::NotifyContinuationResult(int32_t result)
{
APP_LOGI("NotifyContinuationResult, result:%{public}d", result);
if (abilityImpl_ == nullptr) {

4
frameworks/kits/ability/native/test/mock/include/mock_ability_manager_client.h
View File

@ -125,7 +125,7 @@ public:
{
return std::vector<std::shared_ptr<AppExecFwk::DataAbilityResult>>();
};
virtual void NotifyContinuationResult(const int32_t result) {};
virtual void NotifyContinuationResult(int32_t result) {};
virtual void ContinueAbility(const std::string& deviceId) {};
virtual void DumpAbilityInfo(std::vector<std::string> &info) {};
virtual sptr<IRemoteObject> CallRequest()
@ -135,4 +135,4 @@ public:
};
} // namespace AppExecFwk
} // namespace OHOS
#endif // FOUNDATION_APPEXECFWK_OHOS_ABILITY_NATIVE_MOCK_ABILITY_MANAGER_CLIENT_H
#endif // FOUNDATION_APPEXECFWK_OHOS_ABILITY_NATIVE_MOCK_ABILITY_MANAGER_CLIENT_H

2
frameworks/kits/ability/native/test/mock/include/mock_ability_manager_service.h
View File

@ -137,7 +137,7 @@ public:
MOCK_METHOD1(GetPendinTerminateAbilityTestgRequestWant, void(int id));
MOCK_METHOD1(GetSystemMemoryAttr, void(AppExecFwk::SystemMemoryAttr &memoryInfo));
MOCK_METHOD3(StartContinuation, int(const Want &want, const sptr<IRemoteObject> &abilityToken, int32_t status));
MOCK_METHOD2(NotifyContinuationResult, int(int32_t missionId, const int32_t result));
MOCK_METHOD2(NotifyContinuationResult, int(int32_t missionId, int32_t result));
MOCK_METHOD5(ContinueMission, int(const std::string &srcDeviceId, const std::string &dstDeviceId,
int32_t missionId, const sptr<IRemoteObject> &callBack, AAFwk::WantParams &wantParams));
MOCK_METHOD2(ContinueAbility, int(const std::string &deviceId, int32_t missionId));

4
frameworks/kits/ability/native/test/mock/include/mock_ability_scheduler_for_observer.h
View File

@ -58,7 +58,7 @@ public:
MOCK_METHOD2(ScheduleUnregisterObserver, bool(const Uri &uri, const sptr<AAFwk::IDataAbilityObserver> &dataObserver));
MOCK_METHOD1(ScheduleNotifyChange, bool(const Uri &uri));
MOCK_METHOD1(ExecuteBatch, std::vector<std::shared_ptr<AppExecFwk::DataAbilityResult>>(const std::vector<std::shared_ptr<AppExecFwk::DataAbilityOperation>> &operation));
MOCK_METHOD1(NotifyContinuationResult, void(const int32_t result));
MOCK_METHOD1(NotifyContinuationResult, void(int32_t result));
MOCK_METHOD1(ContinueAbility, void(const std::string& deviceId));
MOCK_METHOD1(DumpAbilityInfo, void(std::vector<std::string> &info));
@ -71,4 +71,4 @@ public:
} // namespace AppExecFwk
} // namespace OHOS
#endif /* OHOS_APPEXECFWK_MOCK_ABILITY_SCHEDULER_FOR_OBESERVER_H */
#endif /* OHOS_APPEXECFWK_MOCK_ABILITY_SCHEDULER_FOR_OBESERVER_H */

2
frameworks/kits/test/mock/AMS/mock_ability_manager_service.h
View File

@ -114,7 +114,7 @@ public:
MOCK_METHOD1(SetMissionStackSetting, int(const StackSetting &stackSetting));
MOCK_METHOD1(GetPendinTerminateAbilityTestgRequestWant, void(int id));
MOCK_METHOD3(StartContinuation, int(const Want &want, const sptr<IRemoteObject> &abilityToken, int32_t status));
MOCK_METHOD2(NotifyContinuationResult, int(int32_t missionId, const int32_t result));
MOCK_METHOD2(NotifyContinuationResult, int(int32_t missionId, int32_t result));
MOCK_METHOD5(ContinueMission, int(const std::string &srcDeviceId, const std::string &dstDeviceId,
int32_t missionId, const sptr<IRemoteObject> &callBack, AAFwk::WantParams &wantParams));
MOCK_METHOD2(ContinueAbility, int(const std::string &deviceId, int32_t missionId));

2
frameworks/kits/test/mock/AMS/mock_serviceability_manager_service.h
View File

@ -113,7 +113,7 @@ public:
MOCK_METHOD1(GetPendinTerminateAbilityTestgRequestWant, void(int id));
MOCK_METHOD1(GetSystemMemoryAttr, void(AppExecFwk::SystemMemoryAttr &memoryInfo));
MOCK_METHOD3(StartContinuation, int(const Want &want, const sptr<IRemoteObject> &abilityToken, int32_t status));
MOCK_METHOD2(NotifyContinuationResult, int(int32_t missionId, const int32_t result));
MOCK_METHOD2(NotifyContinuationResult, int(int32_t missionId, int32_t result));
MOCK_METHOD5(ContinueMission, int(const std::string &srcDeviceId, const std::string &dstDeviceId,
int32_t missionId, const sptr<IRemoteObject> &callBack, AAFwk::WantParams &wantParams));
MOCK_METHOD2(ContinueAbility, int(const std::string &deviceId, int32_t missionId));

2
interfaces/innerkits/ability_manager/include/ability_manager_interface.h
View File

@ -544,7 +544,7 @@ public:
virtual void NotifyCompleteContinuation(const std::string &deviceId, int32_t sessionId, bool isSuccess) = 0;
virtual int NotifyContinuationResult(int32_t missionId, const int32_t result) = 0;
virtual int NotifyContinuationResult(int32_t missionId, int32_t result) = 0;
virtual int LockMissionForCleanup(int32_t missionId) = 0;

2
interfaces/innerkits/ability_manager/include/ability_scheduler_interface.h
View File

@ -273,7 +273,7 @@ public:
virtual std::vector<std::shared_ptr<AppExecFwk::DataAbilityResult>> ExecuteBatch(
const std::vector<std::shared_ptr<AppExecFwk::DataAbilityOperation>> &operations) = 0;
virtual void ContinueAbility(const std::string& deviceId) = 0;
virtual void NotifyContinuationResult(const int32_t result) = 0;
virtual void NotifyContinuationResult(int32_t result) = 0;
virtual void DumpAbilityInfo(std::vector<std::string>& info) = 0;

2
services/abilitymgr/include/ability_manager_proxy.h
View File

@ -519,7 +519,7 @@ public:
virtual void NotifyCompleteContinuation(const std::string &deviceId, int32_t sessionId, bool isSuccess) override;
virtual int NotifyContinuationResult(int32_t missionId, const int32_t result) override;
virtual int NotifyContinuationResult(int32_t missionId, int32_t result) override;
virtual int StartSyncRemoteMissions(const std::string& devId, bool fixConflict, int64_t tag) override;

2
services/abilitymgr/include/ability_manager_service.h
View File

@ -215,7 +215,7 @@ public:
* @param result, continuation result.
* @return Returns ERR_OK on success, others on failure.
*/
virtual int NotifyContinuationResult(int32_t missionId, const int32_t result) override;
virtual int NotifyContinuationResult(int32_t missionId, int32_t result) override;
/**
* RegisterMissionListener, register remote device mission listener.

2
services/abilitymgr/include/ability_record.h
View File

@ -755,7 +755,7 @@ public:
void SetLaunchReason(const LaunchReason &reason);
void SetLastExitReason(const LastExitReason &reason);
void ContinueAbility(const std::string& deviceId);
void NotifyContinuationResult(const int32_t result);
void NotifyContinuationResult(int32_t result);
std::shared_ptr<MissionList> GetOwnedMissionList() const;
void SetUseNewMission();

2
services/abilitymgr/include/ability_scheduler_proxy.h
View File

@ -297,7 +297,7 @@ public:
* @param The continuation result.
* @return
*/
void NotifyContinuationResult(const int32_t result) override;
void NotifyContinuationResult(int32_t result) override;
/**
* Dump Ability Runner info.

2
services/abilitymgr/include/lifecycle_deal.h
View File

@ -58,7 +58,7 @@ public:
void ForegroundNew(const Want &want, LifeCycleStateInfo &stateInfo);
void BackgroundNew(const Want &want, LifeCycleStateInfo &stateInfo);
void ContinueAbility(const std::string& deviceId);
void NotifyContinuationResult(const int32_t result);
void NotifyContinuationResult(int32_t result);
private:
sptr<IAbilityScheduler> GetScheduler();

2
services/abilitymgr/src/ability_manager_proxy.cpp
View File

@ -1721,7 +1721,7 @@ void AbilityManagerProxy::NotifyCompleteContinuation(const std::string &deviceId
}
}
int AbilityManagerProxy::NotifyContinuationResult(int32_t missionId, const int32_t result)
int AbilityManagerProxy::NotifyContinuationResult(int32_t missionId, int32_t result)
{
MessageParcel data;
MessageParcel reply;

2
services/abilitymgr/src/ability_manager_service.cpp
View File

@ -1051,7 +1051,7 @@ void AbilityManagerService::NotifyCompleteContinuation(const std::string &device
dmsClient.NotifyCompleteContinuation(Str8ToStr16(deviceId), sessionId, isSuccess);
}
int AbilityManagerService::NotifyContinuationResult(int32_t missionId, const int32_t result)
int AbilityManagerService::NotifyContinuationResult(int32_t missionId, int32_t result)
{
HILOG_INFO("Notify Continuation Result : %{public}d.", result);

2
services/abilitymgr/src/ability_record.cpp
View File

@ -1292,7 +1292,7 @@ void AbilityRecord::SetLastExitReason(const LastExitReason &reason)
lifeCycleStateInfo_.launchParam.lastExitReason = reason;
}
void AbilityRecord::NotifyContinuationResult(const int32_t result)
void AbilityRecord::NotifyContinuationResult(int32_t result)
{
HILOG_INFO("NotifyContinuationResult.");
CHECK_POINTER(lifecycleDeal_);

2
services/abilitymgr/src/lifecycle_deal.cpp
View File

@ -160,7 +160,7 @@ void LifecycleDeal::ContinueAbility(const std::string& deviceId)
abilityScheduler_->ContinueAbility(deviceId);
}
void LifecycleDeal::NotifyContinuationResult(const int32_t result)
void LifecycleDeal::NotifyContinuationResult(int32_t result)
{
HILOG_INFO("NotifyContinuationResult.");
auto abilityScheduler = GetScheduler();

2
services/abilitymgr/test/mock/libs/aakit/include/ability_scheduler.h
View File

@ -97,7 +97,7 @@ public:
{
return std::vector<std::shared_ptr<AppExecFwk::DataAbilityResult>>();
};
virtual void NotifyContinuationResult(const int32_t result) override
virtual void NotifyContinuationResult(int32_t result) override
{};
virtual void ContinueAbility(const std::string& deviceId) override
{};

4
services/abilitymgr/test/mock/libs/ability_scheduler_mock/ability_scheduler_mock.h
View File

@ -41,7 +41,7 @@ public:
MOCK_METHOD3(ScheduleCommandAbility, void(const Want &, bool, int));
MOCK_METHOD1(NotifyTopActiveAbilityChanged, void(bool flag));
MOCK_METHOD2(NotifyMultiWinModeChanged, void(int32_t winModeKey, bool flag));
MOCK_METHOD1(NotifyContinuationResult, void(const int32_t result));
MOCK_METHOD1(NotifyContinuationResult, void(int32_t result));
MOCK_METHOD1(ContinueAbility, void(const std::string& deviceId));
MOCK_METHOD1(DumpAbilityInfo, void(std::vector<std::string> &info));
@ -150,4 +150,4 @@ public:
int code_ = 0;
};
} // namespace AAFwk
} // namespace OHOS
} // namespace OHOS

2
services/abilitymgr/test/unittest/phone/ability_manager_proxy_test/ability_manager_stub_mock.h
View File

@ -393,7 +393,7 @@ public:
MOCK_METHOD2(GetPendingRequestWant, int(const sptr<IWantSender> &target, std::shared_ptr<Want> &want));
MOCK_METHOD1(GetSystemMemoryAttr, void(AppExecFwk::SystemMemoryAttr &memoryInfo));
MOCK_METHOD3(StartContinuation, int(const Want &want, const sptr<IRemoteObject> &abilityToken, int32_t status));
MOCK_METHOD2(NotifyContinuationResult, int(int32_t missionId, const int32_t result));
MOCK_METHOD2(NotifyContinuationResult, int(int32_t missionId, int32_t result));
MOCK_METHOD5(ContinueMission, int(const std::string &srcDeviceId, const std::string &dstDeviceId,
int32_t missionId, const sptr<IRemoteObject> &callBack, AAFwk::WantParams &wantParams));
MOCK_METHOD2(ContinueAbility, int(const std::string &deviceId, int32_t missionId));

2
services/abilitymgr/test/unittest/phone/ability_manager_stub_test/ability_manager_stub_impl_mock.h
View File

@ -49,7 +49,7 @@ public:
MOCK_METHOD2(GetWantSenderInfo, int(const sptr<IWantSender> &target, std::shared_ptr<WantSenderInfo> &info));
MOCK_METHOD2(SetMissionLabel, int(const sptr<IRemoteObject> &token, const std::string &label));
MOCK_METHOD3(StartContinuation, int(const Want &want, const sptr<IRemoteObject> &abilityToken, int32_t status));
MOCK_METHOD2(NotifyContinuationResult, int(int32_t missionId, const int32_t result));
MOCK_METHOD2(NotifyContinuationResult, int(int32_t missionId, int32_t result));
MOCK_METHOD5(ContinueMission, int(const std::string &srcDeviceId, const std::string &dstDeviceId,
int32_t missionId, const sptr<IRemoteObject> &callBack, AAFwk::WantParams &wantParams));
MOCK_METHOD2(ContinueAbility, int(const std::string &deviceId, int32_t missionId));

2
services/abilitymgr/test/unittest/phone/ability_manager_test/ability_manager_stub_mock.h
View File

@ -124,7 +124,7 @@ public:
return 0;
}
MOCK_METHOD3(StartContinuation, int(const Want &want, const sptr<IRemoteObject> &abilityToken, int32_t status));
MOCK_METHOD2(NotifyContinuationResult, int(int32_t missionId, const int32_t result));
MOCK_METHOD2(NotifyContinuationResult, int(int32_t missionId, int32_t result));
MOCK_METHOD5(ContinueMission, int(const std::string &srcDeviceId, const std::string &dstDeviceId,
int32_t missionId, const sptr<IRemoteObject> &callBack, AAFwk::WantParams &wantParams));
MOCK_METHOD2(ContinueAbility, int(const std::string &deviceId, int32_t missionId));

4
services/abilitymgr/test/unittest/phone/ability_scheduler_stub_test/ability_schedule_stub_mock.h
View File

@ -129,7 +129,7 @@ public:
{
return std::vector<std::shared_ptr<AppExecFwk::DataAbilityResult>>();
}
virtual void NotifyContinuationResult(const int32_t result) override
virtual void NotifyContinuationResult(int32_t result) override
{}
virtual void ContinueAbility(const std::string& deviceId) override
{}
@ -143,4 +143,4 @@ public:
} // namespace AAFwk
} // namespace OHOS
#endif
#endif

4
services/formmgr/test/mock/include/mock_ability_manager.h
View File

@ -268,7 +268,7 @@ public:
{
return 0;
}
int NotifyContinuationResult(int32_t missionId, const int32_t result) override
int NotifyContinuationResult(int32_t missionId, int32_t result) override
{
return 0;
}
@ -712,7 +712,7 @@ public:
{
return 0;
}
int NotifyContinuationResult(int32_t missionId, const int32_t result) override
int NotifyContinuationResult(int32_t missionId, int32_t result) override
{
return 0;
}

2
services/test/mock/include/appmgr/mock_ability_mgr_host.h
View File

@ -313,7 +313,7 @@ public:
{
return 0;
}
int NotifyContinuationResult(int32_t missionId, const int32_t result) override
int NotifyContinuationResult(int32_t missionId, int32_t result) override
{
return 0;
}

2
services/test/mock/include/mock_ability_mgr_service.h
View File

@ -96,7 +96,7 @@ public:
MOCK_METHOD1(SetShowOnLockScreen, int(bool isAllow));
MOCK_METHOD1(GetSystemMemoryAttr, void(AppExecFwk::SystemMemoryAttr &memoryInfo));
MOCK_METHOD3(StartContinuation, int(const Want &want, const sptr<IRemoteObject> &abilityToken, int32_t status));
MOCK_METHOD2(NotifyContinuationResult, int(int32_t missionId, const int32_t result));
MOCK_METHOD2(NotifyContinuationResult, int(int32_t missionId, int32_t result));
MOCK_METHOD5(ContinueMission, int(const std::string &srcDeviceId, const std::string &dstDeviceId,
int32_t missionId, const sptr<IRemoteObject> &callBack, AAFwk::WantParams &wantParams));
MOCK_METHOD2(ContinueAbility, int(const std::string &deviceId, int32_t missionId));

2
services/test/mock/include/mock_ability_scheduler.h
View File

@ -42,7 +42,7 @@ public:
ScheduleUnregisterObserver, bool(const Uri &uri, const sptr<AAFwk::IDataAbilityObserver> &dataObserver));
MOCK_METHOD1(ScheduleNotifyChange, bool(const Uri &uri));
MOCK_METHOD1(ExecuteBatch, std::vector<std::shared_ptr<AppExecFwk::DataAbilityResult>>(const std::vector<std::shared_ptr<AppExecFwk::DataAbilityOperation>> &operations));
MOCK_METHOD1(NotifyContinuationResult, void(const int32_t result));
MOCK_METHOD1(NotifyContinuationResult, void(int32_t result));
MOCK_METHOD1(ContinueAbility, void(const std::string& deviceId));
MOCK_METHOD1(DumpAbilityInfo, void(std::vector<std::string> &info));
std::vector<std::string> GetFileTypes(const Uri &uri, const std::string &mimeTypeFilter)

2
services/test/mock/include/mock_ability_scheduler_stub.h
View File

@ -51,7 +51,7 @@ public:
MOCK_METHOD1(ScheduleNotifyChange, bool(const Uri &uri));
MOCK_METHOD1(ExecuteBatch, std::vector<std::shared_ptr<AppExecFwk::DataAbilityResult>>(
const std::vector<std::shared_ptr<AppExecFwk::DataAbilityOperation>> &operations));
MOCK_METHOD1(NotifyContinuationResult, void(const int32_t result));
MOCK_METHOD1(NotifyContinuationResult, void(int32_t result));
MOCK_METHOD1(ContinueAbility, void(const std::string& deviceId));
MOCK_METHOD1(DumpAbilityInfo, void(std::vector<std::string> &info));

2
tools/test/mock/mock_ability_manager_stub.h
View File

@ -119,7 +119,7 @@ public:
MOCK_METHOD1(SetShowOnLockScreen, int(bool isAllow));
MOCK_METHOD1(GetSystemMemoryAttr, void(AppExecFwk::SystemMemoryAttr &memoryInfo));
MOCK_METHOD3(StartContinuation, int(const Want &want, const sptr<IRemoteObject> &abilityToken, int32_t status));
MOCK_METHOD2(NotifyContinuationResult, int(int32_t missionId, const int32_t result));
MOCK_METHOD2(NotifyContinuationResult, int(int32_t missionId, int32_t result));
MOCK_METHOD5(ContinueMission, int(const std::string &srcDeviceId, const std::string &dstDeviceId,
int32_t missionId, const sptr<IRemoteObject> &callBack, AAFwk::WantParams &wantParams));
MOCK_METHOD2(ContinueAbility, int(const std::string &deviceId, int32_t missionId));