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

Merge "Handle SSR based on service list"

Browse source
This commit is contained in:
Linux Build Service Account 2013-07-10 22:23:24 -07:00 committed by Gerrit - the friendly Code Review server
commit cc92e0ccd4
1 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
loc_api/loc_api_v02/loc_api_v02_client.c
View file

@ -1727,21 +1727,21 @@ static locClientStatusEnumType locClientQmiCtrlPointInit(
// get the service addressing information // get the service addressing information
rc = qmi_client_get_service_list(locClientServiceObject, NULL, NULL, rc = qmi_client_get_service_list(locClientServiceObject, NULL, NULL,
&num_services); &num_services);
/* If service is not up wait on a signal until the service is up LOC_LOGV("%s:%d]: qmi_client_get_service_list() rc: %d "
* or a timeout occurs. */ "total timeout: %d", __func__, __LINE__, rc, timeout);
if (rc != QMI_NO_ERR) {
if(rc == QMI_NO_ERR)
break;
/* Service is not up. Wait on a signal until the service is up
or a timeout occurs. */
LOC_LOGD("%s:%d]: Service not up. Starting delay timer\n", __func__, __LINE__);
QMI_CCI_OS_SIGNAL_WAIT(&os_params, LOC_CLIENT_SERVICE_TIMEOUT_UNIT); QMI_CCI_OS_SIGNAL_WAIT(&os_params, LOC_CLIENT_SERVICE_TIMEOUT_UNIT);
nosignal = QMI_CCI_OS_SIGNAL_TIMED_OUT(&os_params); nosignal = QMI_CCI_OS_SIGNAL_TIMED_OUT(&os_params);
if (!nosignal) if(nosignal)
rc = qmi_client_get_service_list(locClientServiceObject, NULL, NULL,
&num_services);
}
timeout += LOC_CLIENT_SERVICE_TIMEOUT_UNIT; timeout += LOC_CLIENT_SERVICE_TIMEOUT_UNIT;
LOC_LOGV("%s:%d]: qmi_client_get_service_list() rc %d, nosignal %d, " } while (timeout < LOC_CLIENT_SERVICE_TIMEOUT_TOTAL);
"total timeout %d", __func__, __LINE__, rc, nosignal, timeout);
} while (timeout < LOC_CLIENT_SERVICE_TIMEOUT_TOTAL && nosignal && rc != QMI_NO_ERR);
if (0 == num_services || rc != QMI_NO_ERR) { if (0 == num_services || rc != QMI_NO_ERR) {
if (!nosignal) { if (!nosignal) {
@ -2209,4 +2209,3 @@ bool locClientGetSizeByEventIndId(uint32_t eventIndId, size_t *pEventIndSize)
// not found // not found
return false; return false;
} }