From dd3dddff4fafa1e9668a0330998e26fa3aef4178 Mon Sep 17 00:00:00 2001 From: yuwenze Date: Wed, 19 Jul 2023 06:35:37 +0000 Subject: [PATCH] modify descriptor Signed-off-by: yuwenze Change-Id: I7064c8191d0257f6a752f5e54815024b7a64b2ab --- .../include/extension_manager_interface.h | 2 +- services/abilitymgr/src/ability_manager_stub.cpp | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/interfaces/inner_api/extension_manager/include/extension_manager_interface.h b/interfaces/inner_api/extension_manager/include/extension_manager_interface.h index 6f1846bfa2..1a84320828 100755 --- a/interfaces/inner_api/extension_manager/include/extension_manager_interface.h +++ b/interfaces/inner_api/extension_manager/include/extension_manager_interface.h @@ -33,7 +33,7 @@ class Want; */ class IExtensionManager : public OHOS::IRemoteBroker { public: - DECLARE_INTERFACE_DESCRIPTOR(u"ohos.aafwk.AbilityManager") + DECLARE_INTERFACE_DESCRIPTOR(u"ohos.aafwk.ExtensionManager") /** * Connect ability common method. diff --git a/services/abilitymgr/src/ability_manager_stub.cpp b/services/abilitymgr/src/ability_manager_stub.cpp index 32d5b94db5..c4af431269 100644 --- a/services/abilitymgr/src/ability_manager_stub.cpp +++ b/services/abilitymgr/src/ability_manager_stub.cpp @@ -27,6 +27,9 @@ namespace OHOS { namespace AAFwk { +namespace { +const std::u16string extensionDescriptor = u"ohos.aafwk.ExtensionManager"; +} AbilityManagerStub::AbilityManagerStub() { FirstStepInit(); @@ -313,9 +316,9 @@ void AbilityManagerStub::ThirdStepInit() int AbilityManagerStub::OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) { - std::u16string descriptor = AbilityManagerStub::GetDescriptor(); + std::u16string abilityDescriptor = AbilityManagerStub::GetDescriptor(); std::u16string remoteDescriptor = data.ReadInterfaceToken(); - if (descriptor != remoteDescriptor) { + if (abilityDescriptor != remoteDescriptor && extensionDescriptor != remoteDescriptor) { HILOG_ERROR("local descriptor is not equal to remote"); return ERR_INVALID_STATE; }