openharmony/base_location
1
0
Fork 0
mirror of https://gitee.com/openharmony/base_location synced 2024-11-23 23:10:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!813 geo 服务断开后，conn_置空，移除监听

Browse Source 
Merge pull request !813 from smilebear/master
This commit is contained in:
openharmony_ci 2024-08-09 09:42:33 +00:00 committed by Gitee
commit 63e30fe039
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
services/location_geocode/geocode/source/geo_convert_service.cpp
View File

@ -346,6 +346,7 @@ void GeoConvertService::DisconnectAbilityConnect()
{
if (conn_ != nullptr) {
AAFwk::AbilityManagerClient::GetInstance()->DisconnectAbility(conn_);
UnRegisterGeoServiceDeathRecipient();
SetServiceConnectState(ServiceConnectState::STATE_DISCONNECT);
conn_ = nullptr;
LBSLOGI(GEO_CONVERT, "UnloadGeoConvert OnStop and disconnect");

17
services/location_network/network/include/network_ability.h
View File

@ -42,6 +42,13 @@ public:
void ProcessEvent(const AppExecFwk::InnerEvent::Pointer& event) override;
};
class NLPServiceDeathRecipient : public IRemoteObject::DeathRecipient {
public:
void OnRemoteDied(const wptr<IRemoteObject> &remote) override;
NLPServiceDeathRecipient();
~NLPServiceDeathRecipient() override;
};
class NetworkAbility : public SystemAbility, public NetworkAbilityStub, public SubAbility {
DECLEAR_SYSTEM_ABILITY(NetworkAbility);
@ -83,6 +90,7 @@ private:
bool RequestNetworkLocation(WorkRecord &workRecord);
bool RemoveNetworkLocation(WorkRecord &workRecord);
void RegisterNLPServiceDeathRecipient();
void UnRegisterNLPServiceDeathRecipient();
bool IsConnect();
ffrt::mutex mutex_;
@ -91,16 +99,11 @@ private:
std::shared_ptr<NetworkHandler> networkHandler_;
size_t mockLocationIndex_ = 0;
bool registerToAbility_ = false;
sptr<IRemoteObject::DeathRecipient> nlpServiceRecipient_ = sptr<NLPServiceDeathRecipient>(new
(std::nothrow) NLPServiceDeathRecipient());
ServiceRunningState state_ = ServiceRunningState::STATE_NOT_START;
sptr<AAFwk::IAbilityConnection> conn_;
};
class NLPServiceDeathRecipient : public IRemoteObject::DeathRecipient {
public:
void OnRemoteDied(const wptr<IRemoteObject> &remote) override;
NLPServiceDeathRecipient();
~NLPServiceDeathRecipient() override;
};
} // namespace Location
} // namespace OHOS
#endif // FEATURE_NETWORK_SUPPORT

22
services/location_network/network/source/network_ability.cpp
View File

@ -280,7 +280,8 @@ void NetworkAbility::RequestRecord(WorkRecord &workRecord, bool isAdded)
if (GetRequestNum() == 0 && conn_ != nullptr) {
LBSLOGI(NETWORK, "RequestRecord disconnect");
AAFwk::AbilityManagerClient::GetInstance()->DisconnectAbility(conn_);
conn_ = nullptr;
UnRegisterNLPServiceDeathRecipient();
conn_ = nullptr ;
}
}
}
@ -487,10 +488,25 @@ void NetworkAbility::RegisterNLPServiceDeathRecipient()
LBSLOGE(NETWORK, "%{public}s: nlpServiceProxy_ is nullptr", __func__);
return;
}
sptr<IRemoteObject::DeathRecipient> death(new (std::nothrow) NLPServiceDeathRecipient());
nlpServiceProxy_->AddDeathRecipient(death);
if (nlpServiceRecipient_ != nullptr) {
nlpServiceProxy_->AddDeathRecipient(nlpServiceRecipient_);
}
}
void NetworkAbility::UnRegisterNLPServiceDeathRecipient()
{
std::unique_lock<ffrt::mutex> uniqueLock(mutex_);
if (nlpServiceProxy_ == nullptr) {
LBSLOGE(NETWORK, "%{public}s: nlpServiceProxy_ is nullptr", __func__);
return;
}
if (nlpServiceRecipient_ != nullptr) {
nlpServiceProxy_->RemoveDeathRecipient(nlpServiceRecipient_);
nlpServiceRecipient_ = nullptr;
}
}
bool NetworkAbility::IsConnect()
{
std::unique_lock<ffrt::mutex> uniqueLock(mutex_);