From 9f6259f0bcf9da22fd3dae37fa05f7d2c2aa60c5 Mon Sep 17 00:00:00 2001 From: Jiafei Wen Date: Thu, 5 Sep 2013 11:05:12 -0700 Subject: [PATCH] Avoid multiple xtra download after booting To avoid multiple xtra data auto-downloading, the change delete the 3 xtra URL in gps.conf used by GpsLocationProvider. Meanwhile, GPS HAL become to allow GLP send Xtra data to modem. CRs: 537744 Change-Id: I27f3122f4ecd1d4da4323e9c59bd0358f3d635f2 --- etc/gps.conf | 8 +++++--- loc_api/libloc_api_50001/loc_eng.cpp | 8 ++++---- loc_api/libloc_api_50001/loc_eng_xtra.cpp | 4 +--- 3 files changed, 10 insertions(+), 10 deletions(-) mode change 100755 => 100644 etc/gps.conf diff --git a/etc/gps.conf b/etc/gps.conf old mode 100755 new mode 100644 index ad38567f..5c9b4d3b --- a/etc/gps.conf +++ b/etc/gps.conf @@ -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 diff --git a/loc_api/libloc_api_50001/loc_eng.cpp b/loc_api/libloc_api_50001/loc_eng.cpp index 77a6bd1c..7165c528 100644 --- a/loc_api/libloc_api_50001/loc_eng.cpp +++ b/loc_api/libloc_api_50001/loc_eng.cpp @@ -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; } diff --git a/loc_api/libloc_api_50001/loc_eng_xtra.cpp b/loc_api/libloc_api_50001/loc_eng_xtra.cpp index 02999bb9..45822867 100644 --- a/loc_api/libloc_api_50001/loc_eng_xtra.cpp +++ b/loc_api/libloc_api_50001/loc_eng_xtra.cpp @@ -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; }