openharmony/base_location
1
0
Fork 0
mirror of https://gitee.com/openharmony/base_location synced 2025-02-25 21:42:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!792 BugFix：locationhub异常唤起应用问题修改

Browse Source 
Merge pull request !792 from 李文龙/master
This commit is contained in:
openharmony_ci 2024-07-24 14:06:42 +00:00 committed by Gitee
commit 5269acc0ad
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
frameworks/native/locator_sdk/source/locator_impl.cpp
View File

@ -1071,9 +1071,13 @@ LocationErrCode LocatorImpl::SetReverseGeocodingMockInfoV9(std::vector<std::shar
LocationErrCode LocatorImpl::ProxyForFreeze(std::set<int> pidList, bool isProxy)
{
if (!LocationSaLoadManager::CheckIfSystemAbilityAvailable(LOCATION_LOCATOR_SA_ID)) {
LBSLOGI(LOCATOR_STANDARD, "%{public}s locator sa is not available.", __func__);
isServerExist_ = false;
return ERRCODE_SUCCESS;
}
if (!LocationSaLoadManager::InitLocationSa(LOCATION_LOCATOR_SA_ID)) {
LBSLOGE(LOCATOR_STANDARD, "%{public}s init locator sa failed", __func__);
isServerExist_ = false;
return ERRCODE_SERVICE_UNAVAILABLE;
}
LBSLOGD(LOCATOR_STANDARD, "LocatorImpl::ProxyForFreeze()");
@ -1090,9 +1094,11 @@ LocationErrCode LocatorImpl::ResetAllProxy()
{
if (!LocationSaLoadManager::CheckIfSystemAbilityAvailable(LOCATION_LOCATOR_SA_ID)) {
LBSLOGI(LOCATOR_STANDARD, "%{public}s, no need reset proxy", __func__);
isServerExist_ = false;
return ERRCODE_SUCCESS;
}
if (!LocationSaLoadManager::InitLocationSa(LOCATION_LOCATOR_SA_ID)) {
isServerExist_ = false;
return ERRCODE_SERVICE_UNAVAILABLE;
}
LBSLOGD(LOCATOR_STANDARD, "LocatorImpl::ResetAllProxy()");
@ -1220,6 +1226,7 @@ sptr<LocatorProxy> LocatorImpl::GetProxy()
}
isServerExist_ = true;
client_ = sptr<LocatorProxy>(new (std::nothrow) LocatorProxy(obj));
LBSLOGI(LOCATOR_STANDARD, "%{public}s: create locator proxy", __func__);
if (saStatusListener_ == nullptr) {
saStatusListener_ = sptr<LocatorSystemAbilityListener>(new LocatorSystemAbilityListener());
}
@ -1359,6 +1366,11 @@ bool LocatorImpl::HasGnssNetworkRequest()
return ret;
}
void LocatorImpl::SetIsServerExist(bool isServerExist)
{
isServerExist_ = isServerExist;
}
void CallbackResumeManager::InitResumeCallbackFuncMap()
{
std::unique_lock<std::mutex> lock(g_resumeFuncMapMutex);
@ -1447,6 +1459,10 @@ void LocatorSystemAbilityListener::OnAddSystemAbility(int32_t systemAbilityId, c
void LocatorSystemAbilityListener::OnRemoveSystemAbility(int32_t systemAbilityId, const std::string& deviceId)
{
LBSLOGD(LOCATOR_STANDARD, "%{public}s enter", __func__);
auto locatorImpl = LocatorImpl::GetInstance();
if (locatorImpl != nullptr) {
locatorImpl->SetIsServerExist(false);
}
std::unique_lock<std::mutex> lock(mutex_);
needResume_ = true;
}

1
interfaces/inner_api/include/locator_impl.h
View File

@ -608,6 +608,7 @@ public:
void RemoveSatelliteStatusChangeCallBack(const sptr<IRemoteObject>& callback);
void AddNmeaCallBack(const sptr<IRemoteObject>& callback);
void RemoveNmeaCallBack(const sptr<IRemoteObject>& callback);
void SetIsServerExist(bool isServerExist);
private:
LocationErrCode CheckEdmPolicy(bool enable);