Merge "deprecate legacy NTP time download"
This commit is contained in:
commit
07440a9459
2 changed files with 3 additions and 3 deletions
|
@ -549,9 +549,8 @@ enum loc_api_adapter_err LocEngAdapter::setTime(GpsUtcTime time,
|
||||||
if (mSupportsTimeInjection) {
|
if (mSupportsTimeInjection) {
|
||||||
LOC_LOGD("%s:%d]: Injecting time", __func__, __LINE__);
|
LOC_LOGD("%s:%d]: Injecting time", __func__, __LINE__);
|
||||||
result = mLocApi->setTime(time, timeReference, uncertainty);
|
result = mLocApi->setTime(time, timeReference, uncertainty);
|
||||||
} else {
|
|
||||||
mSupportsTimeInjection = true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -335,7 +335,8 @@ static int loc_init(GpsCallbacks* callbacks)
|
||||||
retVal = loc_eng_init(loc_afw_data, &clientCallbacks, event, NULL);
|
retVal = loc_eng_init(loc_afw_data, &clientCallbacks, event, NULL);
|
||||||
loc_afw_data.adapter->mSupportsAgpsRequests = !loc_afw_data.adapter->hasAgpsExtendedCapabilities();
|
loc_afw_data.adapter->mSupportsAgpsRequests = !loc_afw_data.adapter->hasAgpsExtendedCapabilities();
|
||||||
loc_afw_data.adapter->mSupportsPositionInjection = !loc_afw_data.adapter->hasCPIExtendedCapabilities();
|
loc_afw_data.adapter->mSupportsPositionInjection = !loc_afw_data.adapter->hasCPIExtendedCapabilities();
|
||||||
loc_afw_data.adapter->mSupportsTimeInjection = !loc_afw_data.adapter->hasCPIExtendedCapabilities();
|
loc_afw_data.adapter->mSupportsTimeInjection = !loc_afw_data.adapter->hasCPIExtendedCapabilities()
|
||||||
|
&& !loc_afw_data.adapter->hasNativeXtraClient();
|
||||||
loc_afw_data.adapter->setGpsLockMsg(0);
|
loc_afw_data.adapter->setGpsLockMsg(0);
|
||||||
loc_afw_data.adapter->requestUlp(ContextBase::getCarrierCapabilities());
|
loc_afw_data.adapter->requestUlp(ContextBase::getCarrierCapabilities());
|
||||||
loc_afw_data.adapter->setXtraUserAgent();
|
loc_afw_data.adapter->setXtraUserAgent();
|
||||||
|
|
Loading…
Reference in a new issue