MiPad4/android_device_xiaomi_sdm660-common
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Fixed SSR issue for GNSS Measurements"

Browse source
This commit is contained in:
Linux Build Service Account 2016-07-25 20:44:08 -07:00 committed by Gerrit - the friendly Code Review server
commit 7124f9f705
5 changed files with 2 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/LocApiBase.cpp
View file

@ -580,11 +580,6 @@ enum loc_api_adapter_err LocApiBase::
setXtraVersionCheck(enum xtra_version_check check) setXtraVersionCheck(enum xtra_version_check check)
DEFAULT_IMPL(LOC_API_ADAPTER_ERR_SUCCESS) DEFAULT_IMPL(LOC_API_ADAPTER_ERR_SUCCESS)
int LocApiBase::
updateRegistrationMask(LOC_API_ADAPTER_EVENT_MASK_T event,
loc_registration_mask_status isEnabled)
DEFAULT_IMPL(-1)
bool LocApiBase:: bool LocApiBase::
gnssConstellationConfig() gnssConstellationConfig()
DEFAULT_IMPL(false) DEFAULT_IMPL(false)

5
core/LocApiBase.h
View file

@ -256,11 +256,6 @@ public:
virtual enum loc_api_adapter_err setXtraVersionCheck(enum xtra_version_check check); virtual enum loc_api_adapter_err setXtraVersionCheck(enum xtra_version_check check);
/*
Update gps reporting events
*/
virtual int updateRegistrationMask(LOC_API_ADAPTER_EVENT_MASK_T event,
loc_registration_mask_status isEnabled);
/* /*
Check if the modem support the service Check if the modem support the service
*/ */

16
loc_api/libloc_api_50001/LocEngAdapter.cpp
View file

@ -587,22 +587,6 @@ void LocEngAdapter::reportGnssMeasurementData(GnssData &gnssMeasurementData)
gnssMeasurementData)); gnssMeasurementData));
} }
/*
Update Registration Mask
*/
void LocEngAdapter::updateRegistrationMask(LOC_API_ADAPTER_EVENT_MASK_T event,
loc_registration_mask_status isEnabled)
{
LOC_LOGD("entering %s", __func__);
int result = LOC_API_ADAPTER_ERR_FAILURE;
result = mLocApi->updateRegistrationMask(event, isEnabled);
if (result == LOC_API_ADAPTER_ERR_SUCCESS) {
LOC_LOGD("%s] update registration mask succeed.", __func__);
} else {
LOC_LOGE("%s] update registration mask failed.", __func__);
}
}
/* /*
Set Gnss Constellation Config Set Gnss Constellation Config
*/ */

6
loc_api/libloc_api_50001/LocEngAdapter.h
View file

@ -351,12 +351,6 @@ public:
return mLocApi->getGpsLock(); return mLocApi->getGpsLock();
} }
/*
Update Registration Mask
*/
void updateRegistrationMask(LOC_API_ADAPTER_EVENT_MASK_T event,
loc_registration_mask_status isEnabled);
/* /*
Set Gnss Constellation Config Set Gnss Constellation Config
*/ */

33
loc_api/libloc_api_50001/loc_eng.cpp
View file

@ -1666,29 +1666,6 @@ struct LocEngInstallAGpsCert : public LocMsg {
} }
}; };
struct LocEngUpdateRegistrationMask : public LocMsg {
loc_eng_data_s_type* mLocEng;
LOC_API_ADAPTER_EVENT_MASK_T mMask;
loc_registration_mask_status mIsEnabled;
inline LocEngUpdateRegistrationMask(loc_eng_data_s_type* locEng,
LOC_API_ADAPTER_EVENT_MASK_T mask,
loc_registration_mask_status isEnabled) :
LocMsg(), mLocEng(locEng), mMask(mask), mIsEnabled(isEnabled) {
locallog();
}
inline virtual void proc() const {
loc_eng_data_s_type *locEng = (loc_eng_data_s_type *)mLocEng;
locEng->adapter->updateRegistrationMask(mMask,
mIsEnabled);
}
void locallog() const {
LOC_LOGV("LocEngUpdateRegistrationMask\n");
}
virtual void log() const {
locallog();
}
};
struct LocEngGnssConstellationConfig : public LocMsg { struct LocEngGnssConstellationConfig : public LocMsg {
LocEngAdapter* mAdapter; LocEngAdapter* mAdapter;
inline LocEngGnssConstellationConfig(LocEngAdapter* adapter) : inline LocEngGnssConstellationConfig(LocEngAdapter* adapter) :
@ -3053,10 +3030,7 @@ int loc_eng_gps_measurement_init(loc_eng_data_s_type &loc_eng_data,
// updated the mask // updated the mask
LOC_API_ADAPTER_EVENT_MASK_T event = LOC_API_ADAPTER_BIT_GNSS_MEASUREMENT; LOC_API_ADAPTER_EVENT_MASK_T event = LOC_API_ADAPTER_BIT_GNSS_MEASUREMENT;
loc_eng_data.adapter->sendMsg(new LocEngUpdateRegistrationMask( loc_eng_data.adapter->updateEvtMask(event, LOC_REGISTRATION_MASK_ENABLED);
&loc_eng_data,
event,
LOC_REGISTRATION_MASK_ENABLED));
// set up the callback // set up the callback
loc_eng_data.gnss_measurement_cb = callbacks->gnss_measurement_callback; loc_eng_data.gnss_measurement_cb = callbacks->gnss_measurement_callback;
LOC_LOGD ("%s, event masks updated successfully", __func__); LOC_LOGD ("%s, event masks updated successfully", __func__);
@ -3088,10 +3062,7 @@ void loc_eng_gps_measurement_close(loc_eng_data_s_type &loc_eng_data)
// updated the mask // updated the mask
LOC_API_ADAPTER_EVENT_MASK_T event = LOC_API_ADAPTER_BIT_GNSS_MEASUREMENT; LOC_API_ADAPTER_EVENT_MASK_T event = LOC_API_ADAPTER_BIT_GNSS_MEASUREMENT;
loc_eng_data.adapter->sendMsg(new LocEngUpdateRegistrationMask( loc_eng_data.adapter->updateEvtMask(event, LOC_REGISTRATION_MASK_DISABLED);
&loc_eng_data,
event,
LOC_REGISTRATION_MASK_DISABLED));
// set up the callback // set up the callback
loc_eng_data.gnss_measurement_cb = NULL; loc_eng_data.gnss_measurement_cb = NULL;
EXIT_LOG(%d, 0); EXIT_LOG(%d, 0);