Merge "Avoid multiple xtra download after booting"

This commit is contained in:
Linux Build Service Account 2013-09-05 22:11:28 -07:00 committed by Gerrit - the friendly Code Review server
commit a7e56b7346
3 changed files with 10 additions and 10 deletions

8
etc/gps.conf Executable file → Normal file
View file

@ -1,6 +1,8 @@
XTRA_SERVER_1=http://xtra1.gpsonextra.net/xtra.bin
XTRA_SERVER_2=http://xtra2.gpsonextra.net/xtra.bin
XTRA_SERVER_3=http://xtra3.gpsonextra.net/xtra.bin
#Uncommenting these urls would only enable
#the power up auto injection and force injection(test case).
#XTRA_SERVER_1=http://xtra1.gpsonextra.net/xtra.bin
#XTRA_SERVER_2=http://xtra2.gpsonextra.net/xtra.bin
#XTRA_SERVER_3=http://xtra3.gpsonextra.net/xtra.bin
# Error Estimate
# _SET = 1

View file

@ -1781,10 +1781,10 @@ int loc_eng_inject_time(loc_eng_data_s_type &loc_eng_data, GpsUtcTime time,
ENTRY_LOG_CALLFLOW();
INIT_CHECK(loc_eng_data.adapter, return -1);
LocEngAdapter* adapter = loc_eng_data.adapter;
if (adapter->mAgpsEnabled) {
adapter->sendMsg(new LocEngSetTime(adapter, time, timeReference,
uncertainty));
}
adapter->sendMsg(new LocEngSetTime(adapter, time, timeReference,
uncertainty));
EXIT_LOG(%d, 0);
return 0;
}

View file

@ -137,9 +137,7 @@ int loc_eng_xtra_inject_data(loc_eng_data_s_type &loc_eng_data,
char* data, int length)
{
LocEngAdapter* adapter = loc_eng_data.adapter;
if (adapter->mAgpsEnabled) {
adapter->sendMsg(new LocEngInjectXtraData(adapter, data, length));
}
adapter->sendMsg(new LocEngInjectXtraData(adapter, data, length));
return 0;
}