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

want agent check need bms

Browse Source 
Signed-off-by: zhuhan <zhuhan10@huawei.com>
Change-Id: Ic3bb052b3fcc23cbef0222acb5ca2f8aa5e5b105
This commit is contained in:
zhuhan
2024-09-30 17:49:45 +08:00
parent ffc23f3682
commit 4724bfbaed
26 changed files with 91 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
interfaces/inner_api/ability_manager/include/ability_manager_interface.h
+1 -1
View File
@@ -814,7 +814,7 @@ public:
}
virtual sptr<IWantSender> GetWantSender(
const WantSenderInfo &wantSenderInfo, const sptr<IRemoteObject> &callerToken) = 0;
const WantSenderInfo &wantSenderInfo, const sptr<IRemoteObject> &callerToken, int32_t uid = -1) = 0;
virtual int SendWantSender(sptr<IWantSender> target, const SenderInfo &senderInfo) = 0;
interfaces/inner_api/wantagent/include/want_agent_client.h
+1 -1
View File
@@ -35,7 +35,7 @@ public:
static WantAgentClient &GetInstance();
ErrCode GetWantSender(const WantSenderInfo &wantSenderInfo, const sptr<IRemoteObject> &callerToken,
sptr<IWantSender> &wantSender);
sptr<IWantSender> &wantSender, int32_t uid = -1);
ErrCode SendWantSender(sptr<IWantSender> target, const SenderInfo &senderInfo);
interfaces/inner_api/wantagent/include/want_agent_helper.h
+2 -2
View File
@@ -71,7 +71,7 @@ public:
* @return Returns the created WantAgent object.
*/
static std::shared_ptr<WantAgent> GetWantAgent(const WantAgentInfo &paramsInfo,
int32_t userId = INVLID_WANT_AGENT_USER_ID);
int32_t userId = INVLID_WANT_AGENT_USER_ID, int32_t uid = -1);
/**
* Obtains an WantAgent object operation type.
@@ -178,7 +178,7 @@ public:
* @param jsonString Json string.
* @return WantAgentInfo object.
*/
static std::shared_ptr<WantAgent> FromString(const std::string &jsonString);
static std::shared_ptr<WantAgent> FromString(const std::string &jsonString, int32_t uid = -1);
private:
WantAgentHelper();
interfaces/inner_api/wantagent/src/want_agent_client.cpp
+7 -1
View File
@@ -39,7 +39,8 @@ WantAgentClient::WantAgentClient() {}
WantAgentClient::~WantAgentClient() {}
ErrCode WantAgentClient::GetWantSender(
const WantSenderInfo &wantSenderInfo, const sptr<IRemoteObject> &callerToken, sptr<IWantSender> &wantSender)
const WantSenderInfo &wantSenderInfo, const sptr<IRemoteObject> &callerToken, sptr<IWantSender> &wantSender,
int32_t uid)
{
auto abms = GetAbilityManager();
CHECK_POINTER_AND_RETURN(abms, ERR_ABILITY_RUNTIME_EXTERNAL_SERVICE_BUSY);
@@ -65,6 +66,11 @@ ErrCode WantAgentClient::GetWantSender(
}
}
if (!data.WriteInt32(uid)) {
TAG_LOGE(AAFwkTag::ABILITYMGR, "uid write fail");
return ERR_ABILITY_RUNTIME_EXTERNAL_INVALID_PARAMETER;
}
auto error = abms->SendRequest(static_cast<uint32_t>(AbilityManagerInterfaceCode::GET_PENDING_WANT_SENDER),
data, reply, option);
if (error != NO_ERROR) {
interfaces/inner_api/wantagent/src/want_agent_helper.cpp
+4 -4
View File
@@ -142,7 +142,7 @@ ErrCode WantAgentHelper::GetWantAgent(
return ERR_OK;
}
std::shared_ptr<WantAgent> WantAgentHelper::GetWantAgent(const WantAgentInfo &paramsInfo, int32_t userId)
std::shared_ptr<WantAgent> WantAgentHelper::GetWantAgent(const WantAgentInfo &paramsInfo, int32_t userId, int32_t uid)
{
std::vector<std::shared_ptr<Want>> wants = paramsInfo.GetWants();
if (wants.empty()) {
@@ -170,7 +170,7 @@ std::shared_ptr<WantAgent> WantAgentHelper::GetWantAgent(const WantAgentInfo &pa
wantSenderInfo.type = static_cast<int32_t>(paramsInfo.GetOperationType());
wantSenderInfo.userId = userId;
sptr<IWantSender> target = nullptr;
WantAgentClient::GetInstance().GetWantSender(wantSenderInfo, nullptr, target);
WantAgentClient::GetInstance().GetWantSender(wantSenderInfo, nullptr, target, uid);
if (target == nullptr) {
return nullptr;
}
@@ -375,7 +375,7 @@ std::string WantAgentHelper::ToString(const std::shared_ptr<WantAgent> &agent)
return jsonObject.dump();
}
std::shared_ptr<WantAgent> WantAgentHelper::FromString(const std::string &jsonString)
std::shared_ptr<WantAgent> WantAgentHelper::FromString(const std::string &jsonString, int32_t uid)
{
if (jsonString.empty()) {
return nullptr;
@@ -420,7 +420,7 @@ std::shared_ptr<WantAgent> WantAgentHelper::FromString(const std::string &jsonSt
}
WantAgentInfo info(requestCode, operationType, flagsVec, wants, extraInfo);
return GetWantAgent(info);
return GetWantAgent(info, INVLID_WANT_AGENT_USER_ID, uid);
}
std::vector<WantAgentConstant::Flags> WantAgentHelper::ParseFlags(nlohmann::json jsonObject)
services/abilitymgr/include/ability_manager_proxy.h
+1 -1
View File
@@ -643,7 +643,7 @@ public:
int32_t appIndex = 0) override;
virtual sptr<IWantSender> GetWantSender(
const WantSenderInfo &wantSenderInfo, const sptr<IRemoteObject> &callerToken) override;
const WantSenderInfo &wantSenderInfo, const sptr<IRemoteObject> &callerToken, int32_t uid = -1) override;
virtual int SendWantSender(sptr<IWantSender> target, const SenderInfo &senderInfo) override;
services/abilitymgr/include/ability_manager_service.h
+1 -1
View File
@@ -880,7 +880,7 @@ public:
int32_t appIndex = 0) override;
virtual sptr<IWantSender> GetWantSender(
const WantSenderInfo &wantSenderInfo, const sptr<IRemoteObject> &callerToken) override;
const WantSenderInfo &wantSenderInfo, const sptr<IRemoteObject> &callerToken, int32_t uid = -1) override;
virtual int SendWantSender(sptr<IWantSender> target, const SenderInfo &senderInfo) override;
services/abilitymgr/src/ability_manager_proxy.cpp
+7 -1
View File
@@ -2004,7 +2004,7 @@ int32_t AbilityManagerProxy::UpgradeApp(const std::string &bundleName, const int
}
sptr<IWantSender> AbilityManagerProxy::GetWantSender(
const WantSenderInfo &wantSenderInfo, const sptr<IRemoteObject> &callerToken)
const WantSenderInfo &wantSenderInfo, const sptr<IRemoteObject> &callerToken, int32_t uid)
{
MessageParcel data;
MessageParcel reply;
@@ -2027,6 +2027,12 @@ sptr<IWantSender> AbilityManagerProxy::GetWantSender(
return nullptr;
}
}
if (!data.WriteInt32(uid)) {
TAG_LOGE(AAFwkTag::ABILITYMGR, "uid write fail");
return nullptr;
}
auto error = SendRequest(AbilityManagerInterfaceCode::GET_PENDING_WANT_SENDER, data, reply, option);
if (error != NO_ERROR) {
TAG_LOGE(AAFwkTag::ABILITYMGR, "request error:%{public}d", error);
services/abilitymgr/src/ability_manager_service.cpp
+15 -7
View File
@@ -4614,7 +4614,8 @@ int AbilityManagerService::UnRegisterMissionListener(const std::string &deviceId
}
sptr<IWantSender> AbilityManagerService::GetWantSender(
const WantSenderInfo &wantSenderInfo, const sptr<IRemoteObject> &callerToken)
const WantSenderInfo &wantSenderInfo, const sptr<IRemoteObject> &callerToken,
int32_t uid)
{
TAG_LOGD(AAFwkTag::ABILITYMGR, "called");
auto pendingWantManager = GetCurrentPendingWantManager();
@@ -4626,6 +4627,7 @@ sptr<IWantSender> AbilityManagerService::GetWantSender(
int32_t callerUid = IPCSkeleton::GetCallingUid();
int32_t userId = wantSenderInfo.userId;
int32_t bundleMgrResult = 0;
if (userId < 0) {
if (DelayedSingleton<AppExecFwk::OsAccountManagerWrapper>::GetInstance()->
GetOsAccountLocalIdFromUid(callerUid, userId) != 0) {
@@ -4633,6 +4635,8 @@ sptr<IWantSender> AbilityManagerService::GetWantSender(
return nullptr;
}
}
//sa caller and has uid，no need find from bms.
bool isSpecifyUidBySa = (uid != -1) && (AAFwk::PermissionVerification::GetInstance()->IsSACall());
int32_t appUid = 0;
int32_t appIndex = 0;
@@ -4640,11 +4644,15 @@ sptr<IWantSender> AbilityManagerService::GetWantSender(
AppExecFwk::BundleInfo bundleInfo;
std::string bundleName = wantSenderInfo.allWants.back().want.GetElement().GetBundleName();
GetRunningMultiAppIndex(bundleName, callerUid, appIndex);
bundleMgrResult = IN_PROCESS_CALL(bms->GetCloneBundleInfo(bundleName,
static_cast<int32_t>(AppExecFwk::GetBundleInfoFlag::GET_BUNDLE_INFO_WITH_APPLICATION),
appIndex, bundleInfo, userId));
if (bundleMgrResult == ERR_OK) {
appUid = bundleInfo.uid;
if (!isSpecifyUidBySa) {
bundleMgrResult = IN_PROCESS_CALL(bms->GetCloneBundleInfo(bundleName,
static_cast<int32_t>(AppExecFwk::GetBundleInfoFlag::GET_BUNDLE_INFO_WITH_APPLICATION),
appIndex, bundleInfo, userId));
if (bundleMgrResult == ERR_OK) {
appUid = bundleInfo.uid;
}
} else {
appUid = uid;
}
TAG_LOGD(AAFwkTag::ABILITYMGR, "App bundleName: %{public}s, uid: %{public}d", bundleName.c_str(), appUid);
}
@@ -4654,7 +4662,7 @@ sptr<IWantSender> AbilityManagerService::GetWantSender(
}
bool isSystemApp = false;
if (!wantSenderInfo.bundleName.empty()) {
if (!wantSenderInfo.bundleName.empty() && !isSpecifyUidBySa) {
AppExecFwk::BundleInfo bundleInfo;
bundleMgrResult = IN_PROCESS_CALL(bms->GetBundleInfo(wantSenderInfo.bundleName,
AppExecFwk::BundleFlag::GET_BUNDLE_DEFAULT, bundleInfo, userId));
services/abilitymgr/src/ability_manager_stub.cpp
+3 -1
View File
@@ -1751,7 +1751,9 @@ int AbilityManagerStub::GetWantSenderInner(MessageParcel &data, MessageParcel &r
if (data.ReadBool()) {
callerToken = data.ReadRemoteObject();
}
sptr<IWantSender> wantSender = GetWantSender(*wantSenderInfo, callerToken);
int32_t uid = data.ReadInt32();
sptr<IWantSender> wantSender = GetWantSender(*wantSenderInfo, callerToken, uid);
if (!reply.WriteRemoteObject(((wantSender == nullptr) ? nullptr : wantSender->AsObject()))) {
TAG_LOGE(AAFwkTag::ABILITYMGR, "failed reply wantSender to client, for write parcel error");
return ERR_INVALID_VALUE;
test/mock/frameworks_kits_ability_ability_runtime_test/AMS/mock_serviceability_manager_service.h
+3 -2
View File
@@ -119,8 +119,9 @@ public:
MOCK_METHOD2(KillProcess, int(const std::string& bundleName, const bool clearPageStack));
MOCK_METHOD2(UninstallApp, int(const std::string& bundleName, int32_t uid));
MOCK_METHOD3(UninstallApp, int32_t(const std::string& bundleName, int32_t uid, int32_t appIndex));
MOCK_METHOD2(
GetWantSender, sptr<IWantSender>(const WantSenderInfo& wantSenderInfo, const sptr<IRemoteObject>& callerToken));
MOCK_METHOD3(
GetWantSender, sptr<IWantSender>(const WantSenderInfo& wantSenderInfo, const sptr<IRemoteObject>& callerToken,
int32_t uid));
MOCK_METHOD2(SendWantSender, int(sptr<IWantSender> target, const SenderInfo& senderInfo));
MOCK_METHOD1(CancelWantSender, void(const sptr<IWantSender>& sender));
MOCK_METHOD1(GetPendingWantUid, int(const sptr<IWantSender>& target));
test/mock/frameworks_kits_ability_native_test/include/mock_ability_manager_service.h
+3 -2
View File
@@ -94,8 +94,9 @@ public:
int StopServiceAbility(const Want& want, int32_t userId = DEFAULT_INVAL_VALUE,
const sptr<IRemoteObject> &token = nullptr) override;
MOCK_METHOD2(
GetWantSender, sptr<IWantSender>(const WantSenderInfo& wantSenderInfo, const sptr<IRemoteObject>& callerToken));
MOCK_METHOD3(
GetWantSender, sptr<IWantSender>(const WantSenderInfo& wantSenderInfo, const sptr<IRemoteObject>& callerToken,
int32_t uid));
MOCK_METHOD2(SendWantSender, int(sptr<IWantSender> target, const SenderInfo& senderInfo));
MOCK_METHOD1(CancelWantSender, void(const sptr<IWantSender>& sender));
MOCK_METHOD1(GetPendingWantUid, int(const sptr<IWantSender>& target));
test/mock/frameworks_kits_appkit_native_test/ability_delegator/mock_ability_delegator_stub.h
+6 -4
View File
@@ -75,8 +75,9 @@ public:
MOCK_METHOD2(MoveMissionToEnd, int(const sptr<IRemoteObject>& token, const bool nonFirst));
MOCK_METHOD1(IsFirstInMission, bool(const sptr<IRemoteObject>& token));
MOCK_METHOD4(CompelVerifyPermission, int(const std::string& permission, int pid, int uid, std::string& message));
MOCK_METHOD2(
GetWantSender, sptr<IWantSender>(const WantSenderInfo& wantSenderInfo, const sptr<IRemoteObject>& callerToken));
MOCK_METHOD3(
GetWantSender, sptr<IWantSender>(const WantSenderInfo& wantSenderInfo, const sptr<IRemoteObject>& callerToken,
int32_t uid));
MOCK_METHOD2(SendWantSender, int(sptr<IWantSender> target, const SenderInfo& senderInfo));
MOCK_METHOD1(CancelWantSender, void(const sptr<IWantSender>& sender));
MOCK_METHOD1(GetPendingWantUid, int(const sptr<IWantSender>& target));
@@ -254,8 +255,9 @@ public:
MOCK_METHOD2(MoveMissionToEnd, int(const sptr<IRemoteObject>& token, const bool nonFirst));
MOCK_METHOD1(IsFirstInMission, bool(const sptr<IRemoteObject>& token));
MOCK_METHOD4(CompelVerifyPermission, int(const std::string& permission, int pid, int uid, std::string& message));
MOCK_METHOD2(
GetWantSender, sptr<IWantSender>(const WantSenderInfo& wantSenderInfo, const sptr<IRemoteObject>& callerToken));
MOCK_METHOD3(
GetWantSender, sptr<IWantSender>(const WantSenderInfo& wantSenderInfo, const sptr<IRemoteObject>& callerToken,
int32_t uid));
MOCK_METHOD2(SendWantSender, int(sptr<IWantSender> target, const SenderInfo& senderInfo));
MOCK_METHOD1(CancelWantSender, void(const sptr<IWantSender>& sender));
MOCK_METHOD1(GetPendingWantUid, int(const sptr<IWantSender>& target));
test/mock/frameworks_kits_test/AMS/mock_ability_manager_service.h
+3 -2
View File
@@ -111,8 +111,9 @@ public:
MOCK_METHOD2(KillProcess, int(const std::string& bundleName, const bool clearPageStack));
MOCK_METHOD2(UninstallApp, int(const std::string& bundleName, int32_t uid));
MOCK_METHOD3(UninstallApp, int32_t(const std::string& bundleName, int32_t uid, int32_t appIndex));
MOCK_METHOD2(
GetWantSender, sptr<IWantSender>(const WantSenderInfo& wantSenderInfo, const sptr<IRemoteObject>& callerToken));
MOCK_METHOD3(
GetWantSender, sptr<IWantSender>(const WantSenderInfo& wantSenderInfo, const sptr<IRemoteObject>& callerToken,
int32_t uid));
MOCK_METHOD2(SendWantSender, int(sptr<IWantSender> target, const SenderInfo& senderInfo));
MOCK_METHOD1(CancelWantSender, void(const sptr<IWantSender>& sender));
MOCK_METHOD1(GetPendingWantUid, int(const sptr<IWantSender>& target));
test/mock/frameworks_kits_test/AMS/mock_serviceability_manager_service.h
+3 -2
View File
@@ -113,8 +113,9 @@ public:
MOCK_METHOD2(KillProcess, int(const std::string& bundleName, const bool clearPageStack));
MOCK_METHOD2(UninstallApp, int(const std::string& bundleName, int32_t uid));
MOCK_METHOD3(UninstallApp, int32_t(const std::string& bundleName, int32_t uid, int32_t appIndex));
MOCK_METHOD2(
GetWantSender, sptr<IWantSender>(const WantSenderInfo& wantSenderInfo, const sptr<IRemoteObject>& callerToken));
MOCK_METHOD3(
GetWantSender, sptr<IWantSender>(const WantSenderInfo& wantSenderInfo, const sptr<IRemoteObject>& callerToken,
int32_t uid));
MOCK_METHOD2(SendWantSender, int(sptr<IWantSender> target, const SenderInfo& senderInfo));
MOCK_METHOD1(CancelWantSender, void(const sptr<IWantSender>& sender));
MOCK_METHOD1(GetPendingWantUid, int(const sptr<IWantSender>& target));
test/moduletest/mock/include/appmgr/mock_ability_mgr_host.h
+1 -1
View File
@@ -152,7 +152,7 @@ public:
}
virtual sptr<AAFwk::IWantSender> GetWantSender(
const WantSenderInfo& wantSenderInfo, const sptr<IRemoteObject>& callerToken) override
const WantSenderInfo& wantSenderInfo, const sptr<IRemoteObject>& callerToken, int32_t uid) override
{
return nullptr;
}
test/moduletest/mock/include/mock_ability_manager_proxy.h
+3 -2
View File
@@ -59,8 +59,9 @@ public:
MOCK_METHOD3(UninstallApp, int32_t(const std::string&, int32_t, int32_t));
MOCK_METHOD4(OnRemoteRequest, int(uint32_t code, MessageParcel& data, MessageParcel& reply, MessageOption& option));
MOCK_METHOD3(StartAbility, int(const Want& want, const sptr<IRemoteObject>& callerToken, int requestCode));
MOCK_METHOD2(
GetWantSender, sptr<IWantSender>(const WantSenderInfo& wantSenderInfo, const sptr<IRemoteObject>& callerToken));
MOCK_METHOD3(
GetWantSender, sptr<IWantSender>(const WantSenderInfo& wantSenderInfo, const sptr<IRemoteObject>& callerToken,
int32_t uid));
MOCK_METHOD2(SendWantSender, int(sptr<IWantSender> target, const SenderInfo& senderInfo));
MOCK_METHOD1(CancelWantSender, void(const sptr<IWantSender>& sender));
MOCK_METHOD1(GetPendingWantUid, int(const sptr<IWantSender>& target));
test/moduletest/mock/include/mock_ability_mgr_service.h
+3 -2
View File
@@ -67,8 +67,9 @@ public:
MOCK_METHOD2(UninstallApp, int(const std::string&, int32_t));
MOCK_METHOD3(UninstallApp, int32_t(const std::string&, int32_t, int32_t));
MOCK_METHOD4(OnRemoteRequest, int(uint32_t code, MessageParcel& data, MessageParcel& reply, MessageOption& option));
MOCK_METHOD2(
GetWantSender, sptr<IWantSender>(const WantSenderInfo& wantSenderInfo, const sptr<IRemoteObject>& callerToken));
MOCK_METHOD3(
GetWantSender, sptr<IWantSender>(const WantSenderInfo& wantSenderInfo, const sptr<IRemoteObject>& callerToken,
int32_t uid));
MOCK_METHOD2(SendWantSender, int(sptr<IWantSender> target, const SenderInfo& senderInfo));
MOCK_METHOD1(CancelWantSender, void(const sptr<IWantSender>& sender));
MOCK_METHOD1(GetPendingWantUid, int(const sptr<IWantSender>& target));
test/unittest/ability_manager_client_branch_second_test/ability_manager_stub_mock_second_test.h
+3 -2
View File
@@ -302,8 +302,9 @@ public:
uint64_t intentId, int32_t userId));
MOCK_METHOD5(StartAbilityAsCaller, int(const Want& want, const sptr<IRemoteObject>& callerToken,
sptr<IRemoteObject> asCallerSourceToken, int32_t userId, int requestCode));
MOCK_METHOD2(
GetWantSender, sptr<IWantSender>(const WantSenderInfo& wantSenderInfo, const sptr<IRemoteObject>& callerToken));
MOCK_METHOD3(
GetWantSender, sptr<IWantSender>(const WantSenderInfo& wantSenderInfo, const sptr<IRemoteObject>& callerToken,
int32_t uid));
MOCK_METHOD2(SendWantSender, int(sptr<IWantSender> target, const SenderInfo& senderInfo));
MOCK_METHOD1(CancelWantSender, void(const sptr<IWantSender>& sender));
MOCK_METHOD1(GetPendingWantUid, int(const sptr<IWantSender>& target));
test/unittest/ability_manager_client_branch_test/ability_manager_stub_mock_test.h
+3 -2
View File
@@ -302,8 +302,9 @@ public:
uint64_t intentId, int32_t userId));
MOCK_METHOD5(StartAbilityAsCaller, int(const Want& want, const sptr<IRemoteObject>& callerToken,
sptr<IRemoteObject> asCallerSourceToken, int32_t userId, int requestCode));
MOCK_METHOD2(
GetWantSender, sptr<IWantSender>(const WantSenderInfo& wantSenderInfo, const sptr<IRemoteObject>& callerToken));
MOCK_METHOD3(
GetWantSender, sptr<IWantSender>(const WantSenderInfo& wantSenderInfo, const sptr<IRemoteObject>& callerToken,
int32_t uid));
MOCK_METHOD2(SendWantSender, int(sptr<IWantSender> target, const SenderInfo& senderInfo));
MOCK_METHOD1(CancelWantSender, void(const sptr<IWantSender>& sender));
MOCK_METHOD1(GetPendingWantUid, int(const sptr<IWantSender>& target));
test/unittest/ability_manager_proxy_test/ability_manager_stub_mock.h
+3 -2
View File
@@ -314,8 +314,9 @@ public:
uint64_t intentId, int32_t userId));
MOCK_METHOD5(StartAbilityAsCaller, int(const Want &want, const sptr<IRemoteObject> &callerToken,
sptr<IRemoteObject> asCallerSourceToken, int32_t userId, int requestCode));
MOCK_METHOD2(
GetWantSender, sptr<IWantSender>(const WantSenderInfo& wantSenderInfo, const sptr<IRemoteObject>& callerToken));
MOCK_METHOD3(
GetWantSender, sptr<IWantSender>(const WantSenderInfo& wantSenderInfo, const sptr<IRemoteObject>& callerToken,
int32_t uid));
MOCK_METHOD2(SendWantSender, int(sptr<IWantSender> target, const SenderInfo& senderInfo));
MOCK_METHOD1(CancelWantSender, void(const sptr<IWantSender>& sender));
MOCK_METHOD1(GetPendingWantUid, int(const sptr<IWantSender>& target));
test/unittest/ability_manager_stub_test/ability_manager_stub_impl_mock.h
+3 -2
View File
@@ -42,8 +42,9 @@ public:
uint64_t intentId, int32_t userId));
MOCK_METHOD5(StartAbilityAsCaller, int(const Want &want, const sptr<IRemoteObject> &callerToken,
sptr<IRemoteObject> asCallerSourceToken, int32_t userId, int requestCode));
MOCK_METHOD2(
GetWantSender, sptr<IWantSender>(const WantSenderInfo& wantSenderInfo, const sptr<IRemoteObject>& callerToken));
MOCK_METHOD3(
GetWantSender, sptr<IWantSender>(const WantSenderInfo& wantSenderInfo, const sptr<IRemoteObject>& callerToken,
int32_t uid));
MOCK_METHOD2(SendWantSender, int(sptr<IWantSender> target, const SenderInfo& senderInfo));
MOCK_METHOD1(CancelWantSender, void(const sptr<IWantSender>& sender));
MOCK_METHOD1(GetPendingWantUid, int(const sptr<IWantSender>& target));
test/unittest/ability_manager_test/ability_manager_stub_mock.h
+3 -2
View File
@@ -307,8 +307,9 @@ public:
uint64_t intentId, int32_t userId));
MOCK_METHOD5(StartAbilityAsCaller, int(const Want& want, const sptr<IRemoteObject>& callerToken,
sptr<IRemoteObject> asCallerSourceToken, int32_t userId, int requestCode));
MOCK_METHOD2(
GetWantSender, sptr<IWantSender>(const WantSenderInfo& wantSenderInfo, const sptr<IRemoteObject>& callerToken));
MOCK_METHOD3(
GetWantSender, sptr<IWantSender>(const WantSenderInfo& wantSenderInfo, const sptr<IRemoteObject>& callerToken,
int32_t uid));
MOCK_METHOD2(SendWantSender, int(sptr<IWantSender> target, const SenderInfo& senderInfo));
MOCK_METHOD1(CancelWantSender, void(const sptr<IWantSender>& sender));
MOCK_METHOD1(GetPendingWantUid, int(const sptr<IWantSender>& target));
test/unittest/service_extension_context_test/ability_manager_stub_mock.h
+3 -2
View File
@@ -278,8 +278,9 @@ public:
uint64_t intentId, int32_t userId));
MOCK_METHOD5(StartAbilityAsCaller, int(const Want& want, const sptr<IRemoteObject>& callerToken,
sptr<IRemoteObject> asCallerSourceToken, int32_t userId, int requestCode));
MOCK_METHOD2(
GetWantSender, sptr<IWantSender>(const WantSenderInfo& wantSenderInfo, const sptr<IRemoteObject>& callerToken));
MOCK_METHOD3(
GetWantSender, sptr<IWantSender>(const WantSenderInfo& wantSenderInfo, const sptr<IRemoteObject>& callerToken,
int32_t uid));
MOCK_METHOD2(SendWantSender, int(sptr<IWantSender> target, const SenderInfo& senderInfo));
MOCK_METHOD1(CancelWantSender, void(const sptr<IWantSender>& sender));
MOCK_METHOD1(GetPendingWantUid, int(const sptr<IWantSender>& target));
test/unittest/sys_mgr_client_test/mock_ability_manager_service.h
+3 -2
View File
@@ -92,8 +92,9 @@ public:
MOCK_METHOD2(KillProcess, int(const std::string& bundleName, const bool clearPageStack));
MOCK_METHOD2(UninstallApp, int(const std::string& bundleName, int32_t uid));
MOCK_METHOD3(UninstallApp, int32_t(const std::string& bundleName, int32_t uid, int32_t appIndex));
MOCK_METHOD2(
GetWantSender, sptr<IWantSender>(const WantSenderInfo& wantSenderInfo, const sptr<IRemoteObject>& callerToken));
MOCK_METHOD3(
GetWantSender, sptr<IWantSender>(const WantSenderInfo& wantSenderInfo, const sptr<IRemoteObject>& callerToken,
int32_t uid));
MOCK_METHOD2(SendWantSender, int(sptr<IWantSender> target, const SenderInfo& senderInfo));
MOCK_METHOD1(CancelWantSender, void(const sptr<IWantSender>& sender));
MOCK_METHOD1(GetPendingWantUid, int(const sptr<IWantSender>& target));
tools/test/mock/mock_ability_manager_stub.h
+3 -2
View File
@@ -73,8 +73,9 @@ public:
MOCK_METHOD2(UninstallApp, int(const std::string& bundleName, int32_t uid));
MOCK_METHOD3(UninstallApp, int32_t(const std::string& bundleName, int32_t uid, int32_t appIndex));
MOCK_METHOD2(
GetWantSender, sptr<IWantSender>(const WantSenderInfo& wantSenderInfo, const sptr<IRemoteObject>& callerToken));
MOCK_METHOD3(
GetWantSender, sptr<IWantSender>(const WantSenderInfo& wantSenderInfo, const sptr<IRemoteObject>& callerToken,
int32_t uid));
MOCK_METHOD2(SendWantSender, int(sptr<IWantSender> target, const SenderInfo& senderInfo));
MOCK_METHOD1(CancelWantSender, void(const sptr<IWantSender>& sender));
MOCK_METHOD1(GetPendingWantUid, int(const sptr<IWantSender>& target));