Merge "Adding check of on_demand_time for inject time"

This commit is contained in:
Linux Build Service Account 2013-09-05 22:12:11 -07:00 committed by Gerrit - the friendly Code Review server
commit 5e3119dca0

View file

@ -1163,10 +1163,12 @@ LocEngRequestTime::LocEngRequestTime(void* locEng) :
} }
void LocEngRequestTime::proc() const { void LocEngRequestTime::proc() const {
loc_eng_data_s_type* locEng = (loc_eng_data_s_type*)mLocEng; loc_eng_data_s_type* locEng = (loc_eng_data_s_type*)mLocEng;
if (locEng->request_utc_time_cb != NULL) { if (gps_conf.CAPABILITIES & GPS_CAPABILITY_ON_DEMAND_TIME) {
locEng->request_utc_time_cb(); if (locEng->request_utc_time_cb != NULL) {
} else { locEng->request_utc_time_cb();
LOC_LOGE("Callback function for request time is NULL"); } else {
LOC_LOGE("Callback function for request time is NULL");
}
} }
} }
inline void LocEngRequestTime::locallog() const { inline void LocEngRequestTime::locallog() const {