Merge "support reinjecting supl url for sim hot swap"
This commit is contained in:
commit
511b1ac909
1 changed files with 20 additions and 20 deletions
|
@ -2501,11 +2501,7 @@ int loc_eng_set_server_proxy(loc_eng_data_s_type &loc_eng_data,
|
||||||
ENTRY_LOG_CALLFLOW();
|
ENTRY_LOG_CALLFLOW();
|
||||||
int ret_val = 0;
|
int ret_val = 0;
|
||||||
|
|
||||||
if (NULL != loc_eng_data.adapter)
|
LOC_LOGV("save the address, type: %d, hostname: %s, port: %d",
|
||||||
{
|
|
||||||
ret_val = loc_eng_set_server(loc_eng_data, type, hostname, port);
|
|
||||||
} else {
|
|
||||||
LOC_LOGW("set_server called before init. save the address, type: %d, hostname: %s, port: %d",
|
|
||||||
(int) type, hostname, port);
|
(int) type, hostname, port);
|
||||||
switch (type)
|
switch (type)
|
||||||
{
|
{
|
||||||
|
@ -2524,6 +2520,10 @@ int loc_eng_set_server_proxy(loc_eng_data_s_type &loc_eng_data,
|
||||||
default:
|
default:
|
||||||
LOC_LOGE("loc_eng_set_server_proxy, unknown server type = %d", (int) type);
|
LOC_LOGE("loc_eng_set_server_proxy, unknown server type = %d", (int) type);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (NULL != loc_eng_data.adapter)
|
||||||
|
{
|
||||||
|
ret_val = loc_eng_set_server(loc_eng_data, type, hostname, port);
|
||||||
}
|
}
|
||||||
|
|
||||||
EXIT_LOG(%d, ret_val);
|
EXIT_LOG(%d, ret_val);
|
||||||
|
|
Loading…
Reference in a new issue