From fc56628d06b795c43f804f6fa930ea0ecdaa6895 Mon Sep 17 00:00:00 2001 From: Tushar Janefalkar Date: Thu, 7 Mar 2013 15:24:28 -0800 Subject: [PATCH] Send data disable to modem during init This is to avoid data being enabled when data roaming is turned off. Change-Id: If2c2f89669d872bfd4e8579f682d0c61904fe7c8 CRs-fixed: 460376 --- loc_api/libloc_api_50001/loc_eng.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/loc_api/libloc_api_50001/loc_eng.cpp b/loc_api/libloc_api_50001/loc_eng.cpp index 28cbb6e8..47813530 100644 --- a/loc_api/libloc_api_50001/loc_eng.cpp +++ b/loc_api/libloc_api_50001/loc_eng.cpp @@ -426,6 +426,13 @@ static int loc_eng_reinit(loc_eng_data_s_type &loc_eng_data) sap_conf.SENSOR_ALGORITHM_CONFIG_MASK)); msg_q_snd((void*)((LocEngContext*)(loc_eng_data.context))->deferred_q, sensor_perf_control_conf_msg, loc_eng_free_msg); + + //Send data disable to modem. This will be set to enable when + //an UPDATE_NETWORK_STATE event is received from Android + loc_eng_msg_set_data_enable *msg(new loc_eng_msg_set_data_enable(&loc_eng_data, NULL, + 0, 0)); + msg_q_snd((void*)((LocEngContext*)(loc_eng_data.context))->deferred_q, + msg, loc_eng_free_msg); } EXIT_LOG(%d, ret_val); @@ -1797,7 +1804,8 @@ static void loc_eng_deferred_action_thread(void* arg) { loc_eng_msg_set_data_enable *unaMsg = (loc_eng_msg_set_data_enable*)msg; loc_eng_data_p->client_handle->enableData(unaMsg->enable); - loc_eng_data_p->client_handle->setAPN(unaMsg->apn, unaMsg->length); + if(unaMsg->apn != NULL) + loc_eng_data_p->client_handle->setAPN(unaMsg->apn, unaMsg->length); } break;