diff --git a/interfaces/inner_api/ability_manager/include/ability_manager_interface.h b/interfaces/inner_api/ability_manager/include/ability_manager_interface.h index 1c22cb525d..487abbe688 100644 --- a/interfaces/inner_api/ability_manager/include/ability_manager_interface.h +++ b/interfaces/inner_api/ability_manager/include/ability_manager_interface.h @@ -814,7 +814,7 @@ public: } virtual sptr GetWantSender( - const WantSenderInfo &wantSenderInfo, const sptr &callerToken) = 0; + const WantSenderInfo &wantSenderInfo, const sptr &callerToken, int32_t uid = -1) = 0; virtual int SendWantSender(sptr target, const SenderInfo &senderInfo) = 0; diff --git a/interfaces/inner_api/wantagent/include/want_agent_client.h b/interfaces/inner_api/wantagent/include/want_agent_client.h index 441b6b8367..37ac3caad6 100644 --- a/interfaces/inner_api/wantagent/include/want_agent_client.h +++ b/interfaces/inner_api/wantagent/include/want_agent_client.h @@ -35,7 +35,7 @@ public: static WantAgentClient &GetInstance(); ErrCode GetWantSender(const WantSenderInfo &wantSenderInfo, const sptr &callerToken, - sptr &wantSender); + sptr &wantSender, int32_t uid = -1); ErrCode SendWantSender(sptr target, const SenderInfo &senderInfo); diff --git a/interfaces/inner_api/wantagent/include/want_agent_helper.h b/interfaces/inner_api/wantagent/include/want_agent_helper.h index d003e21db1..a44caacb52 100644 --- a/interfaces/inner_api/wantagent/include/want_agent_helper.h +++ b/interfaces/inner_api/wantagent/include/want_agent_helper.h @@ -71,7 +71,7 @@ public: * @return Returns the created WantAgent object. */ static std::shared_ptr GetWantAgent(const WantAgentInfo ¶msInfo, - 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 FromString(const std::string &jsonString); + static std::shared_ptr FromString(const std::string &jsonString, int32_t uid = -1); private: WantAgentHelper(); diff --git a/interfaces/inner_api/wantagent/src/want_agent_client.cpp b/interfaces/inner_api/wantagent/src/want_agent_client.cpp index 8ccccfc4c0..8f9c56e0ee 100644 --- a/interfaces/inner_api/wantagent/src/want_agent_client.cpp +++ b/interfaces/inner_api/wantagent/src/want_agent_client.cpp @@ -39,7 +39,8 @@ WantAgentClient::WantAgentClient() {} WantAgentClient::~WantAgentClient() {} ErrCode WantAgentClient::GetWantSender( - const WantSenderInfo &wantSenderInfo, const sptr &callerToken, sptr &wantSender) + const WantSenderInfo &wantSenderInfo, const sptr &callerToken, sptr &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(AbilityManagerInterfaceCode::GET_PENDING_WANT_SENDER), data, reply, option); if (error != NO_ERROR) { diff --git a/interfaces/inner_api/wantagent/src/want_agent_helper.cpp b/interfaces/inner_api/wantagent/src/want_agent_helper.cpp index 23b73c35e9..8fb34136fd 100644 --- a/interfaces/inner_api/wantagent/src/want_agent_helper.cpp +++ b/interfaces/inner_api/wantagent/src/want_agent_helper.cpp @@ -142,7 +142,7 @@ ErrCode WantAgentHelper::GetWantAgent( return ERR_OK; } -std::shared_ptr WantAgentHelper::GetWantAgent(const WantAgentInfo ¶msInfo, int32_t userId) +std::shared_ptr WantAgentHelper::GetWantAgent(const WantAgentInfo ¶msInfo, int32_t userId, int32_t uid) { std::vector> wants = paramsInfo.GetWants(); if (wants.empty()) { @@ -170,7 +170,7 @@ std::shared_ptr WantAgentHelper::GetWantAgent(const WantAgentInfo &pa wantSenderInfo.type = static_cast(paramsInfo.GetOperationType()); wantSenderInfo.userId = userId; sptr 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 &agent) return jsonObject.dump(); } -std::shared_ptr WantAgentHelper::FromString(const std::string &jsonString) +std::shared_ptr WantAgentHelper::FromString(const std::string &jsonString, int32_t uid) { if (jsonString.empty()) { return nullptr; @@ -420,7 +420,7 @@ std::shared_ptr 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 WantAgentHelper::ParseFlags(nlohmann::json jsonObject) diff --git a/services/abilitymgr/include/ability_manager_proxy.h b/services/abilitymgr/include/ability_manager_proxy.h index 51321dae55..8f51e3b83d 100644 --- a/services/abilitymgr/include/ability_manager_proxy.h +++ b/services/abilitymgr/include/ability_manager_proxy.h @@ -643,7 +643,7 @@ public: int32_t appIndex = 0) override; virtual sptr GetWantSender( - const WantSenderInfo &wantSenderInfo, const sptr &callerToken) override; + const WantSenderInfo &wantSenderInfo, const sptr &callerToken, int32_t uid = -1) override; virtual int SendWantSender(sptr target, const SenderInfo &senderInfo) override; diff --git a/services/abilitymgr/include/ability_manager_service.h b/services/abilitymgr/include/ability_manager_service.h index 58771f740a..80815ce33e 100644 --- a/services/abilitymgr/include/ability_manager_service.h +++ b/services/abilitymgr/include/ability_manager_service.h @@ -880,7 +880,7 @@ public: int32_t appIndex = 0) override; virtual sptr GetWantSender( - const WantSenderInfo &wantSenderInfo, const sptr &callerToken) override; + const WantSenderInfo &wantSenderInfo, const sptr &callerToken, int32_t uid = -1) override; virtual int SendWantSender(sptr target, const SenderInfo &senderInfo) override; diff --git a/services/abilitymgr/src/ability_manager_proxy.cpp b/services/abilitymgr/src/ability_manager_proxy.cpp index 66865f0b8c..32be58a3c1 100644 --- a/services/abilitymgr/src/ability_manager_proxy.cpp +++ b/services/abilitymgr/src/ability_manager_proxy.cpp @@ -2004,7 +2004,7 @@ int32_t AbilityManagerProxy::UpgradeApp(const std::string &bundleName, const int } sptr AbilityManagerProxy::GetWantSender( - const WantSenderInfo &wantSenderInfo, const sptr &callerToken) + const WantSenderInfo &wantSenderInfo, const sptr &callerToken, int32_t uid) { MessageParcel data; MessageParcel reply; @@ -2027,6 +2027,12 @@ sptr 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); diff --git a/services/abilitymgr/src/ability_manager_service.cpp b/services/abilitymgr/src/ability_manager_service.cpp index 0a6d521be4..266e23ee53 100644 --- a/services/abilitymgr/src/ability_manager_service.cpp +++ b/services/abilitymgr/src/ability_manager_service.cpp @@ -4614,7 +4614,8 @@ int AbilityManagerService::UnRegisterMissionListener(const std::string &deviceId } sptr AbilityManagerService::GetWantSender( - const WantSenderInfo &wantSenderInfo, const sptr &callerToken) + const WantSenderInfo &wantSenderInfo, const sptr &callerToken, + int32_t uid) { TAG_LOGD(AAFwkTag::ABILITYMGR, "called"); auto pendingWantManager = GetCurrentPendingWantManager(); @@ -4626,6 +4627,7 @@ sptr AbilityManagerService::GetWantSender( int32_t callerUid = IPCSkeleton::GetCallingUid(); int32_t userId = wantSenderInfo.userId; int32_t bundleMgrResult = 0; + if (userId < 0) { if (DelayedSingleton::GetInstance()-> GetOsAccountLocalIdFromUid(callerUid, userId) != 0) { @@ -4633,6 +4635,8 @@ sptr 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 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(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(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 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)); diff --git a/services/abilitymgr/src/ability_manager_stub.cpp b/services/abilitymgr/src/ability_manager_stub.cpp index cbeaff74b8..61859c3cf2 100644 --- a/services/abilitymgr/src/ability_manager_stub.cpp +++ b/services/abilitymgr/src/ability_manager_stub.cpp @@ -1751,7 +1751,9 @@ int AbilityManagerStub::GetWantSenderInner(MessageParcel &data, MessageParcel &r if (data.ReadBool()) { callerToken = data.ReadRemoteObject(); } - sptr wantSender = GetWantSender(*wantSenderInfo, callerToken); + + int32_t uid = data.ReadInt32(); + sptr 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; diff --git a/test/mock/frameworks_kits_ability_ability_runtime_test/AMS/mock_serviceability_manager_service.h b/test/mock/frameworks_kits_ability_ability_runtime_test/AMS/mock_serviceability_manager_service.h index d1261649b5..a565a27f2b 100644 --- a/test/mock/frameworks_kits_ability_ability_runtime_test/AMS/mock_serviceability_manager_service.h +++ b/test/mock/frameworks_kits_ability_ability_runtime_test/AMS/mock_serviceability_manager_service.h @@ -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(const WantSenderInfo& wantSenderInfo, const sptr& callerToken)); + MOCK_METHOD3( + GetWantSender, sptr(const WantSenderInfo& wantSenderInfo, const sptr& callerToken, + int32_t uid)); MOCK_METHOD2(SendWantSender, int(sptr target, const SenderInfo& senderInfo)); MOCK_METHOD1(CancelWantSender, void(const sptr& sender)); MOCK_METHOD1(GetPendingWantUid, int(const sptr& target)); diff --git a/test/mock/frameworks_kits_ability_native_test/include/mock_ability_manager_service.h b/test/mock/frameworks_kits_ability_native_test/include/mock_ability_manager_service.h index d969c6394b..ebe3184920 100644 --- a/test/mock/frameworks_kits_ability_native_test/include/mock_ability_manager_service.h +++ b/test/mock/frameworks_kits_ability_native_test/include/mock_ability_manager_service.h @@ -94,8 +94,9 @@ public: int StopServiceAbility(const Want& want, int32_t userId = DEFAULT_INVAL_VALUE, const sptr &token = nullptr) override; - MOCK_METHOD2( - GetWantSender, sptr(const WantSenderInfo& wantSenderInfo, const sptr& callerToken)); + MOCK_METHOD3( + GetWantSender, sptr(const WantSenderInfo& wantSenderInfo, const sptr& callerToken, + int32_t uid)); MOCK_METHOD2(SendWantSender, int(sptr target, const SenderInfo& senderInfo)); MOCK_METHOD1(CancelWantSender, void(const sptr& sender)); MOCK_METHOD1(GetPendingWantUid, int(const sptr& target)); diff --git a/test/mock/frameworks_kits_appkit_native_test/ability_delegator/mock_ability_delegator_stub.h b/test/mock/frameworks_kits_appkit_native_test/ability_delegator/mock_ability_delegator_stub.h index 693f9feb11..15e18b6857 100644 --- a/test/mock/frameworks_kits_appkit_native_test/ability_delegator/mock_ability_delegator_stub.h +++ b/test/mock/frameworks_kits_appkit_native_test/ability_delegator/mock_ability_delegator_stub.h @@ -75,8 +75,9 @@ public: MOCK_METHOD2(MoveMissionToEnd, int(const sptr& token, const bool nonFirst)); MOCK_METHOD1(IsFirstInMission, bool(const sptr& token)); MOCK_METHOD4(CompelVerifyPermission, int(const std::string& permission, int pid, int uid, std::string& message)); - MOCK_METHOD2( - GetWantSender, sptr(const WantSenderInfo& wantSenderInfo, const sptr& callerToken)); + MOCK_METHOD3( + GetWantSender, sptr(const WantSenderInfo& wantSenderInfo, const sptr& callerToken, + int32_t uid)); MOCK_METHOD2(SendWantSender, int(sptr target, const SenderInfo& senderInfo)); MOCK_METHOD1(CancelWantSender, void(const sptr& sender)); MOCK_METHOD1(GetPendingWantUid, int(const sptr& target)); @@ -254,8 +255,9 @@ public: MOCK_METHOD2(MoveMissionToEnd, int(const sptr& token, const bool nonFirst)); MOCK_METHOD1(IsFirstInMission, bool(const sptr& token)); MOCK_METHOD4(CompelVerifyPermission, int(const std::string& permission, int pid, int uid, std::string& message)); - MOCK_METHOD2( - GetWantSender, sptr(const WantSenderInfo& wantSenderInfo, const sptr& callerToken)); + MOCK_METHOD3( + GetWantSender, sptr(const WantSenderInfo& wantSenderInfo, const sptr& callerToken, + int32_t uid)); MOCK_METHOD2(SendWantSender, int(sptr target, const SenderInfo& senderInfo)); MOCK_METHOD1(CancelWantSender, void(const sptr& sender)); MOCK_METHOD1(GetPendingWantUid, int(const sptr& target)); diff --git a/test/mock/frameworks_kits_test/AMS/mock_ability_manager_service.h b/test/mock/frameworks_kits_test/AMS/mock_ability_manager_service.h index d107915586..17c9d4d1c0 100644 --- a/test/mock/frameworks_kits_test/AMS/mock_ability_manager_service.h +++ b/test/mock/frameworks_kits_test/AMS/mock_ability_manager_service.h @@ -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(const WantSenderInfo& wantSenderInfo, const sptr& callerToken)); + MOCK_METHOD3( + GetWantSender, sptr(const WantSenderInfo& wantSenderInfo, const sptr& callerToken, + int32_t uid)); MOCK_METHOD2(SendWantSender, int(sptr target, const SenderInfo& senderInfo)); MOCK_METHOD1(CancelWantSender, void(const sptr& sender)); MOCK_METHOD1(GetPendingWantUid, int(const sptr& target)); diff --git a/test/mock/frameworks_kits_test/AMS/mock_serviceability_manager_service.h b/test/mock/frameworks_kits_test/AMS/mock_serviceability_manager_service.h index 729d28506d..bed70ec930 100644 --- a/test/mock/frameworks_kits_test/AMS/mock_serviceability_manager_service.h +++ b/test/mock/frameworks_kits_test/AMS/mock_serviceability_manager_service.h @@ -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(const WantSenderInfo& wantSenderInfo, const sptr& callerToken)); + MOCK_METHOD3( + GetWantSender, sptr(const WantSenderInfo& wantSenderInfo, const sptr& callerToken, + int32_t uid)); MOCK_METHOD2(SendWantSender, int(sptr target, const SenderInfo& senderInfo)); MOCK_METHOD1(CancelWantSender, void(const sptr& sender)); MOCK_METHOD1(GetPendingWantUid, int(const sptr& target)); diff --git a/test/moduletest/mock/include/appmgr/mock_ability_mgr_host.h b/test/moduletest/mock/include/appmgr/mock_ability_mgr_host.h index ad9b12d231..a5bd6f543d 100644 --- a/test/moduletest/mock/include/appmgr/mock_ability_mgr_host.h +++ b/test/moduletest/mock/include/appmgr/mock_ability_mgr_host.h @@ -152,7 +152,7 @@ public: } virtual sptr GetWantSender( - const WantSenderInfo& wantSenderInfo, const sptr& callerToken) override + const WantSenderInfo& wantSenderInfo, const sptr& callerToken, int32_t uid) override { return nullptr; } diff --git a/test/moduletest/mock/include/mock_ability_manager_proxy.h b/test/moduletest/mock/include/mock_ability_manager_proxy.h index 3469ac2a65..27a75c2941 100644 --- a/test/moduletest/mock/include/mock_ability_manager_proxy.h +++ b/test/moduletest/mock/include/mock_ability_manager_proxy.h @@ -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& callerToken, int requestCode)); - MOCK_METHOD2( - GetWantSender, sptr(const WantSenderInfo& wantSenderInfo, const sptr& callerToken)); + MOCK_METHOD3( + GetWantSender, sptr(const WantSenderInfo& wantSenderInfo, const sptr& callerToken, + int32_t uid)); MOCK_METHOD2(SendWantSender, int(sptr target, const SenderInfo& senderInfo)); MOCK_METHOD1(CancelWantSender, void(const sptr& sender)); MOCK_METHOD1(GetPendingWantUid, int(const sptr& target)); diff --git a/test/moduletest/mock/include/mock_ability_mgr_service.h b/test/moduletest/mock/include/mock_ability_mgr_service.h index 5f2e3d1101..a654c3489c 100644 --- a/test/moduletest/mock/include/mock_ability_mgr_service.h +++ b/test/moduletest/mock/include/mock_ability_mgr_service.h @@ -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(const WantSenderInfo& wantSenderInfo, const sptr& callerToken)); + MOCK_METHOD3( + GetWantSender, sptr(const WantSenderInfo& wantSenderInfo, const sptr& callerToken, + int32_t uid)); MOCK_METHOD2(SendWantSender, int(sptr target, const SenderInfo& senderInfo)); MOCK_METHOD1(CancelWantSender, void(const sptr& sender)); MOCK_METHOD1(GetPendingWantUid, int(const sptr& target)); diff --git a/test/unittest/ability_manager_client_branch_second_test/ability_manager_stub_mock_second_test.h b/test/unittest/ability_manager_client_branch_second_test/ability_manager_stub_mock_second_test.h index bdefcc4924..c2a3ae020f 100644 --- a/test/unittest/ability_manager_client_branch_second_test/ability_manager_stub_mock_second_test.h +++ b/test/unittest/ability_manager_client_branch_second_test/ability_manager_stub_mock_second_test.h @@ -302,8 +302,9 @@ public: uint64_t intentId, int32_t userId)); MOCK_METHOD5(StartAbilityAsCaller, int(const Want& want, const sptr& callerToken, sptr asCallerSourceToken, int32_t userId, int requestCode)); - MOCK_METHOD2( - GetWantSender, sptr(const WantSenderInfo& wantSenderInfo, const sptr& callerToken)); + MOCK_METHOD3( + GetWantSender, sptr(const WantSenderInfo& wantSenderInfo, const sptr& callerToken, + int32_t uid)); MOCK_METHOD2(SendWantSender, int(sptr target, const SenderInfo& senderInfo)); MOCK_METHOD1(CancelWantSender, void(const sptr& sender)); MOCK_METHOD1(GetPendingWantUid, int(const sptr& target)); diff --git a/test/unittest/ability_manager_client_branch_test/ability_manager_stub_mock_test.h b/test/unittest/ability_manager_client_branch_test/ability_manager_stub_mock_test.h index 913864e3ff..e424e4d36f 100644 --- a/test/unittest/ability_manager_client_branch_test/ability_manager_stub_mock_test.h +++ b/test/unittest/ability_manager_client_branch_test/ability_manager_stub_mock_test.h @@ -302,8 +302,9 @@ public: uint64_t intentId, int32_t userId)); MOCK_METHOD5(StartAbilityAsCaller, int(const Want& want, const sptr& callerToken, sptr asCallerSourceToken, int32_t userId, int requestCode)); - MOCK_METHOD2( - GetWantSender, sptr(const WantSenderInfo& wantSenderInfo, const sptr& callerToken)); + MOCK_METHOD3( + GetWantSender, sptr(const WantSenderInfo& wantSenderInfo, const sptr& callerToken, + int32_t uid)); MOCK_METHOD2(SendWantSender, int(sptr target, const SenderInfo& senderInfo)); MOCK_METHOD1(CancelWantSender, void(const sptr& sender)); MOCK_METHOD1(GetPendingWantUid, int(const sptr& target)); diff --git a/test/unittest/ability_manager_proxy_test/ability_manager_stub_mock.h b/test/unittest/ability_manager_proxy_test/ability_manager_stub_mock.h index c865bdbeeb..d44cbc1425 100644 --- a/test/unittest/ability_manager_proxy_test/ability_manager_stub_mock.h +++ b/test/unittest/ability_manager_proxy_test/ability_manager_stub_mock.h @@ -314,8 +314,9 @@ public: uint64_t intentId, int32_t userId)); MOCK_METHOD5(StartAbilityAsCaller, int(const Want &want, const sptr &callerToken, sptr asCallerSourceToken, int32_t userId, int requestCode)); - MOCK_METHOD2( - GetWantSender, sptr(const WantSenderInfo& wantSenderInfo, const sptr& callerToken)); + MOCK_METHOD3( + GetWantSender, sptr(const WantSenderInfo& wantSenderInfo, const sptr& callerToken, + int32_t uid)); MOCK_METHOD2(SendWantSender, int(sptr target, const SenderInfo& senderInfo)); MOCK_METHOD1(CancelWantSender, void(const sptr& sender)); MOCK_METHOD1(GetPendingWantUid, int(const sptr& target)); diff --git a/test/unittest/ability_manager_stub_test/ability_manager_stub_impl_mock.h b/test/unittest/ability_manager_stub_test/ability_manager_stub_impl_mock.h index 68357025a8..03d7ad6af3 100644 --- a/test/unittest/ability_manager_stub_test/ability_manager_stub_impl_mock.h +++ b/test/unittest/ability_manager_stub_test/ability_manager_stub_impl_mock.h @@ -42,8 +42,9 @@ public: uint64_t intentId, int32_t userId)); MOCK_METHOD5(StartAbilityAsCaller, int(const Want &want, const sptr &callerToken, sptr asCallerSourceToken, int32_t userId, int requestCode)); - MOCK_METHOD2( - GetWantSender, sptr(const WantSenderInfo& wantSenderInfo, const sptr& callerToken)); + MOCK_METHOD3( + GetWantSender, sptr(const WantSenderInfo& wantSenderInfo, const sptr& callerToken, + int32_t uid)); MOCK_METHOD2(SendWantSender, int(sptr target, const SenderInfo& senderInfo)); MOCK_METHOD1(CancelWantSender, void(const sptr& sender)); MOCK_METHOD1(GetPendingWantUid, int(const sptr& target)); diff --git a/test/unittest/ability_manager_test/ability_manager_stub_mock.h b/test/unittest/ability_manager_test/ability_manager_stub_mock.h index fb865bd827..a83f4def88 100644 --- a/test/unittest/ability_manager_test/ability_manager_stub_mock.h +++ b/test/unittest/ability_manager_test/ability_manager_stub_mock.h @@ -307,8 +307,9 @@ public: uint64_t intentId, int32_t userId)); MOCK_METHOD5(StartAbilityAsCaller, int(const Want& want, const sptr& callerToken, sptr asCallerSourceToken, int32_t userId, int requestCode)); - MOCK_METHOD2( - GetWantSender, sptr(const WantSenderInfo& wantSenderInfo, const sptr& callerToken)); + MOCK_METHOD3( + GetWantSender, sptr(const WantSenderInfo& wantSenderInfo, const sptr& callerToken, + int32_t uid)); MOCK_METHOD2(SendWantSender, int(sptr target, const SenderInfo& senderInfo)); MOCK_METHOD1(CancelWantSender, void(const sptr& sender)); MOCK_METHOD1(GetPendingWantUid, int(const sptr& target)); diff --git a/test/unittest/service_extension_context_test/ability_manager_stub_mock.h b/test/unittest/service_extension_context_test/ability_manager_stub_mock.h index de066b364c..565ac1ae5c 100644 --- a/test/unittest/service_extension_context_test/ability_manager_stub_mock.h +++ b/test/unittest/service_extension_context_test/ability_manager_stub_mock.h @@ -278,8 +278,9 @@ public: uint64_t intentId, int32_t userId)); MOCK_METHOD5(StartAbilityAsCaller, int(const Want& want, const sptr& callerToken, sptr asCallerSourceToken, int32_t userId, int requestCode)); - MOCK_METHOD2( - GetWantSender, sptr(const WantSenderInfo& wantSenderInfo, const sptr& callerToken)); + MOCK_METHOD3( + GetWantSender, sptr(const WantSenderInfo& wantSenderInfo, const sptr& callerToken, + int32_t uid)); MOCK_METHOD2(SendWantSender, int(sptr target, const SenderInfo& senderInfo)); MOCK_METHOD1(CancelWantSender, void(const sptr& sender)); MOCK_METHOD1(GetPendingWantUid, int(const sptr& target)); diff --git a/test/unittest/sys_mgr_client_test/mock_ability_manager_service.h b/test/unittest/sys_mgr_client_test/mock_ability_manager_service.h index 39f25663d7..74fce65089 100644 --- a/test/unittest/sys_mgr_client_test/mock_ability_manager_service.h +++ b/test/unittest/sys_mgr_client_test/mock_ability_manager_service.h @@ -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(const WantSenderInfo& wantSenderInfo, const sptr& callerToken)); + MOCK_METHOD3( + GetWantSender, sptr(const WantSenderInfo& wantSenderInfo, const sptr& callerToken, + int32_t uid)); MOCK_METHOD2(SendWantSender, int(sptr target, const SenderInfo& senderInfo)); MOCK_METHOD1(CancelWantSender, void(const sptr& sender)); MOCK_METHOD1(GetPendingWantUid, int(const sptr& target)); diff --git a/tools/test/mock/mock_ability_manager_stub.h b/tools/test/mock/mock_ability_manager_stub.h index ce9485a203..d340b05560 100644 --- a/tools/test/mock/mock_ability_manager_stub.h +++ b/tools/test/mock/mock_ability_manager_stub.h @@ -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(const WantSenderInfo& wantSenderInfo, const sptr& callerToken)); + MOCK_METHOD3( + GetWantSender, sptr(const WantSenderInfo& wantSenderInfo, const sptr& callerToken, + int32_t uid)); MOCK_METHOD2(SendWantSender, int(sptr target, const SenderInfo& senderInfo)); MOCK_METHOD1(CancelWantSender, void(const sptr& sender)); MOCK_METHOD1(GetPendingWantUid, int(const sptr& target));