openharmony/telephony_core_service
1
0
Fork 0
mirror of https://gitee.com/openharmony/telephony_core_service synced 2024-11-23 16:09:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: remove death recipient when core service client destory

Browse Source 
Signed-off-by: liujiandong <liujiandong1@huawei.com>
This commit is contained in:
YOUR_NAME 2023-03-09 19:51:45 +08:00
parent 84c0089b06
commit b0864112e1
2 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
frameworks/native/src/core_service_client.cpp
View File

@ -28,7 +28,10 @@ namespace Telephony {
constexpr int32_t INVALID_VALUE = -1;
CoreServiceClient::CoreServiceClient() = default;
CoreServiceClient::~CoreServiceClient() = default;
CoreServiceClient::~CoreServiceClient()
{
RemoveDeathRecipient(nullptr, false);
}
sptr<ICoreService> CoreServiceClient::GetProxy()
{
@ -65,21 +68,32 @@ sptr<ICoreService> CoreServiceClient::GetProxy()
void CoreServiceClient::OnRemoteDied(const wptr<IRemoteObject> &remote)
{
if (remote == nullptr) {
TELEPHONY_LOGE("OnRemoteDied failed, remote is nullptr");
RemoveDeathRecipient(remote, true);
}
void CoreServiceClient::RemoveDeathRecipient(const wptr<IRemoteObject> &remote, bool isRemoteDied)
{
if (isRemoteDied && remote == nullptr) {
TELEPHONY_LOGE("Remote died, remote is nullptr");
return;
}
std::lock_guard<std::mutex> lock(mutexProxy_);
if (proxy_ == nullptr) {
TELEPHONY_LOGE("OnRemoteDied proxy_ is nullptr");
TELEPHONY_LOGE("proxy_ is nullptr");
return;
}
auto serviceRemote = proxy_->AsObject();
if ((serviceRemote != nullptr) && (serviceRemote == remote.promote())) {
serviceRemote->RemoveDeathRecipient(deathRecipient_);
proxy_ = nullptr;
TELEPHONY_LOGE("on remote died");
if (serviceRemote == nullptr) {
TELEPHONY_LOGE("serviceRemote is nullptr");
return;
}
if (isRemoteDied && serviceRemote != remote.promote()) {
TELEPHONY_LOGE("Remote died serviceRemote is not same");
return;
}
serviceRemote->RemoveDeathRecipient(deathRecipient_);
proxy_ = nullptr;
TELEPHONY_LOGI("RemoveDeathRecipient success");
}
int32_t CoreServiceClient::GetPsRadioTech(int32_t slotId, int32_t &psRadioTech)

1
interfaces/innerkits/include/core_service_client.h
View File

@ -121,6 +121,7 @@ public:
int32_t UnregisterImsRegInfoCallback(int32_t slotId, ImsServiceType imsSrvType);
private:
void RemoveDeathRecipient(const wptr<IRemoteObject> &remote, bool isRemoteDied);
class CoreServiceDeathRecipient : public IRemoteObject::DeathRecipient {
public:
explicit CoreServiceDeathRecipient(CoreServiceClient &client) : client_(client) {}