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

Merge "Merge tag 'AU_LINUX_ANDROID_KK.04.04.04.010.110' into HEAD"

Browse source
This commit is contained in:
Linux Build Service Account 2014-08-22 23:36:01 -07:00 committed by Gerrit - the friendly Code Review server
commit 406e7c4c15
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
core/gps_extended_c.h
View file

@ -308,6 +308,7 @@ enum loc_api_adapter_err {
LOC_API_ADAPTER_ERR_PHONE_OFFLINE = 7, LOC_API_ADAPTER_ERR_PHONE_OFFLINE = 7,
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_INTERNAL = 10,
/* equating engine down to phone offline, as they are the same errror */ /* equating engine down to phone offline, as they are the same errror */
LOC_API_ADAPTER_ERR_ENGINE_DOWN = LOC_API_ADAPTER_ERR_PHONE_OFFLINE, LOC_API_ADAPTER_ERR_ENGINE_DOWN = LOC_API_ADAPTER_ERR_PHONE_OFFLINE,

2
loc_api/libloc_api_50001/loc_eng.cpp
View file

@ -1769,7 +1769,7 @@ static int loc_eng_start_handler(loc_eng_data_s_type &loc_eng_data)
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_PHONE_OFFLINE ||
ret_val == LOC_API_ADAPTER_ERR_GENERAL_FAILURE) ret_val == LOC_API_ADAPTER_ERR_INTERNAL)
{ {
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);