From 2abe41d44fd391b98a34507781e6856a2797a799 Mon Sep 17 00:00:00 2001 From: Kevin Tang Date: Thu, 7 Aug 2014 18:12:38 -0700 Subject: [PATCH] Fix for CR 692085, error mapping incorrect in one of the cases eLOC_CLIENT_FAILURE_INTERNAL returned from loc_api_v02 was mapped to LOC_API_ADAPTER_ERR_FAILUR, however in loc_eng_start_handle it is LOC_API_ADAPTER_ERR_GENERAL_FAILURE that is being checked for. Created a new error ID LOC_API_ADAPTER_ERR_INTERNAL specifically for this error case. Change-Id: Ib2ad6e983d6c598ec57f1a2584166da2be95946b CRs-Fixed: 706520 --- core/gps_extended_c.h | 1 + loc_api/libloc_api_50001/loc_eng.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/core/gps_extended_c.h b/core/gps_extended_c.h index 04a78a31..81e0fa00 100644 --- a/core/gps_extended_c.h +++ b/core/gps_extended_c.h @@ -305,6 +305,7 @@ enum loc_api_adapter_err { LOC_API_ADAPTER_ERR_PHONE_OFFLINE = 7, LOC_API_ADAPTER_ERR_TIMEOUT = 8, 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 */ LOC_API_ADAPTER_ERR_ENGINE_DOWN = LOC_API_ADAPTER_ERR_PHONE_OFFLINE, diff --git a/loc_api/libloc_api_50001/loc_eng.cpp b/loc_api/libloc_api_50001/loc_eng.cpp index b23df770..1e8075f7 100644 --- a/loc_api/libloc_api_50001/loc_eng.cpp +++ b/loc_api/libloc_api_50001/loc_eng.cpp @@ -1720,7 +1720,7 @@ static int loc_eng_start_handler(loc_eng_data_s_type &loc_eng_data) if (ret_val == LOC_API_ADAPTER_ERR_SUCCESS || ret_val == LOC_API_ADAPTER_ERR_ENGINE_DOWN || 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_inform_gps_status(loc_eng_data, GPS_STATUS_SESSION_BEGIN);