From ef7a8694d7f3e7004ecd66cfb3038526866914d0 Mon Sep 17 00:00:00 2001 From: Satheesh Jayakumar Date: Wed, 4 Sep 2013 09:29:10 -0700 Subject: [PATCH] Small fixes to conditionally launch the BIT Interface thread Changes to launch the BIT service request handler thread only if AggpsExt is present. Small formatting fixes for pritining the IP address. Change-Id: Iaf3b9bd6d967ba35b04b591750784c5f221ee539 --- loc_api/libloc_api_50001/loc_eng.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/loc_api/libloc_api_50001/loc_eng.cpp b/loc_api/libloc_api_50001/loc_eng.cpp index 77a6bd1c..c0781d52 100644 --- a/loc_api/libloc_api_50001/loc_eng.cpp +++ b/loc_api/libloc_api_50001/loc_eng.cpp @@ -929,10 +929,10 @@ void LocEngReqRelBIT::proc() const { } inline void LocEngReqRelBIT::locallog() const { LOC_LOGV("LocEngRequestBIT - ipv4: %d.%d.%d.%d, ipv6: %s", - (unsigned char)(mIPv4Addr>>24), - (unsigned char)(mIPv4Addr>>16), - (unsigned char)(mIPv4Addr>>8), (unsigned char)mIPv4Addr, + (unsigned char)(mIPv4Addr>>8), + (unsigned char)(mIPv4Addr>>16), + (unsigned char)(mIPv4Addr>>24), NULL != mIPv6Addr ? mIPv6Addr : ""); } inline void LocEngReqRelBIT::log() const { @@ -1988,7 +1988,7 @@ void loc_eng_agps_init(loc_eng_data_s_type &loc_eng_data, AGpsExtCallbacks* call __func__, __LINE__); return; } - + LocEngAdapter* adapter = loc_eng_data.adapter; loc_eng_data.agps_status_cb = callbacks->status_cb; loc_eng_data.agnss_nif = new AgpsStateMachine(servicerTypeAgps, @@ -2005,9 +2005,10 @@ void loc_eng_agps_init(loc_eng_data_s_type &loc_eng_data, AGpsExtCallbacks* call true); loc_eng_data.adapter->sendMsg(new LocEngDataClientInit(&loc_eng_data)); - loc_eng_dmn_conn_loc_api_server_launch(callbacks->create_thread_cb, - NULL, NULL, &loc_eng_data); - + if (adapter->mAgpsEnabled) { + loc_eng_dmn_conn_loc_api_server_launch(callbacks->create_thread_cb, + NULL, NULL, &loc_eng_data); + } loc_eng_agps_reinit(loc_eng_data); EXIT_LOG(%s, VOID_RET); }