diff options
| author | Gjermund Hodnebrog <gjermund.hodnebrog@stericsson.com> | 2011-05-24 13:55:02 +0200 |
|---|---|---|
| committer | Sverre Vegge <sverre.vegge@stericsson.com> | 2011-08-02 22:48:32 +0200 |
| commit | 0cc5f0c2cf103e9de87d6a55a15c9cefc63f8032 (patch) | |
| tree | 6748324888472c42c3271b8b8f3c7182044bc57a | |
| parent | a968a9a7c7e3e36684b36304ea234bb68ddc5cbe (diff) | |
| download | u300-0cc5f0c2cf103e9de87d6a55a15c9cefc63f8032.tar.gz | |
Network: Respond to REGISTRATION_STATE even if AT*EWSCI fails
Signed-off-by: Sverre Vegge <sverre.vegge@stericsson.com>
| -rw-r--r-- | u300-ril-network.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/u300-ril-network.c b/u300-ril-network.c index 8ebf0fd..6e785a7 100644 --- a/u300-ril-network.c +++ b/u300-ril-network.c @@ -1841,11 +1841,11 @@ wa_final: /* PrimaryScramblingCode */ asprintf(&responseStr[14], "%04x", response[14]); count = 15; - } else - responseStr[14] = NULL; + } } #endif +finally: /* * Note that Ril.h specifies that all 15 bytes of the response is * mandatory. However the Android reference RIL cuts the length of the @@ -1855,8 +1855,14 @@ wa_final: */ RIL_onRequestComplete(t, RIL_E_SUCCESS, responseStr, count * sizeof(char *)); + goto exit; -finally: +error: + LOGE("requestRegistrationState must never return an error when radio is " + "on."); + RIL_onRequestComplete(t, RIL_E_GENERIC_FAILURE, NULL, 0); + +exit: #ifdef LTE_COMMAND_SET_ENABLED (void)at_send_command("AT+CGREG=0;+CREG=0", NULL); #else @@ -1870,12 +1876,6 @@ finally: at_response_free(atresponse); return; - -error: - LOGE("requestRegistrationState must never return an error when radio is " - "on."); - RIL_onRequestComplete(t, RIL_E_GENERIC_FAILURE, NULL, 0); - goto finally; } /** |