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

Merge "fixing the SSR recovery race condition"

Browse source
This commit is contained in:
Linux Build Service Account 2014-08-01 09:04:23 -07:00 committed by Gerrit - the friendly Code Review server
commit 44d7fb9ceb
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/gps_extended_c.h
View file

@ -306,8 +306,9 @@ enum loc_api_adapter_err {
LOC_API_ADAPTER_ERR_TIMEOUT = 8, LOC_API_ADAPTER_ERR_TIMEOUT = 8,
LOC_API_ADAPTER_ERR_SERVICE_NOT_PRESENT = 9, LOC_API_ADAPTER_ERR_SERVICE_NOT_PRESENT = 9,
LOC_API_ADAPTER_ERR_ENGINE_DOWN = 100, /* equating engine down to phone offline, as they are the same errror */
LOC_API_ADAPTER_ERR_FAILURE, LOC_API_ADAPTER_ERR_ENGINE_DOWN = LOC_API_ADAPTER_ERR_PHONE_OFFLINE,
LOC_API_ADAPTER_ERR_FAILURE = 101,
LOC_API_ADAPTER_ERR_UNKNOWN LOC_API_ADAPTER_ERR_UNKNOWN
}; };

4
loc_api/libloc_api_50001/loc_eng.cpp
View file

@ -1718,7 +1718,9 @@ static int loc_eng_start_handler(loc_eng_data_s_type &loc_eng_data)
ret_val = loc_eng_data.adapter->startFix(); ret_val = loc_eng_data.adapter->startFix();
if (ret_val == LOC_API_ADAPTER_ERR_SUCCESS || if (ret_val == LOC_API_ADAPTER_ERR_SUCCESS ||
ret_val == LOC_API_ADAPTER_ERR_ENGINE_DOWN) ret_val == LOC_API_ADAPTER_ERR_ENGINE_DOWN ||
ret_val == LOC_API_ADAPTER_ERR_PHONE_OFFLINE ||
ret_val == LOC_API_ADAPTER_ERR_GENERAL_FAILURE)
{ {
loc_eng_data.adapter->setInSession(TRUE); loc_eng_data.adapter->setInSession(TRUE);
loc_inform_gps_status(loc_eng_data, GPS_STATUS_SESSION_BEGIN); loc_inform_gps_status(loc_eng_data, GPS_STATUS_SESSION_BEGIN);