From 8977164eee956eed8f7b287e158ebddb4d2621dd Mon Sep 17 00:00:00 2001 From: Kevin Tang Date: Sat, 19 Jul 2014 18:37:29 -0700 Subject: [PATCH] fixing the SSR recovery race condition There is a race condition where when startFix is called right at the time when modem or griffon subsystem is down, GPS HAL doesn't get the correct error code, and therefore the right handling. Mapped ENGINE_DOWN to ENGINE_OFFLINE, as they are the same; and modified loc_eng_start_handler to update the state upon the right error code. There is a one problem though. General failure is also handled as SSR. This is because of an unhandled race condition in the kernel, so the error code returned and propagated is not deterministic enough for us to tell if this is SSR. Until that fix is in place, we might have to treat general failure as SSR although the side effect should be none. Only semantically incorrect. Change-Id: If93823f08428275da171bb22d73a06e38365585b CR-Fixed: 692085 --- core/gps_extended_c.h | 5 +++-- loc_api/libloc_api_50001/loc_eng.cpp | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/core/gps_extended_c.h b/core/gps_extended_c.h index d4a7dbea..04a78a31 100644 --- a/core/gps_extended_c.h +++ b/core/gps_extended_c.h @@ -306,8 +306,9 @@ enum loc_api_adapter_err { LOC_API_ADAPTER_ERR_TIMEOUT = 8, LOC_API_ADAPTER_ERR_SERVICE_NOT_PRESENT = 9, - LOC_API_ADAPTER_ERR_ENGINE_DOWN = 100, - LOC_API_ADAPTER_ERR_FAILURE, + /* equating engine down to phone offline, as they are the same errror */ + LOC_API_ADAPTER_ERR_ENGINE_DOWN = LOC_API_ADAPTER_ERR_PHONE_OFFLINE, + LOC_API_ADAPTER_ERR_FAILURE = 101, LOC_API_ADAPTER_ERR_UNKNOWN }; diff --git a/loc_api/libloc_api_50001/loc_eng.cpp b/loc_api/libloc_api_50001/loc_eng.cpp index 320a61d8..b23df770 100644 --- a/loc_api/libloc_api_50001/loc_eng.cpp +++ b/loc_api/libloc_api_50001/loc_eng.cpp @@ -1718,7 +1718,9 @@ static int loc_eng_start_handler(loc_eng_data_s_type &loc_eng_data) ret_val = loc_eng_data.adapter->startFix(); if (ret_val == LOC_API_ADAPTER_ERR_SUCCESS || - ret_val == LOC_API_ADAPTER_ERR_ENGINE_DOWN) + ret_val == LOC_API_ADAPTER_ERR_ENGINE_DOWN || + ret_val == LOC_API_ADAPTER_ERR_PHONE_OFFLINE || + ret_val == LOC_API_ADAPTER_ERR_GENERAL_FAILURE) { loc_eng_data.adapter->setInSession(TRUE); loc_inform_gps_status(loc_eng_data, GPS_STATUS_SESSION_BEGIN);