From 4fad5f4a1ab92a5134b24402b73efd010d67c6df Mon Sep 17 00:00:00 2001 From: Wootak Jung Date: Mon, 21 Mar 2016 16:04:43 +0900 Subject: [PATCH] Changed to return empty string if there is no EF file - SPN/MSISDN/GID1 are optional fields Change-Id: I15fc090405835e01973a8eb64abc34f5c5530683 --- include/telephony_sim.h | 48 +++++++++++++++++++++---------------------- packaging/capi-telephony.spec | 2 +- src/telephony_sim.c | 7 +++++++ 3 files changed, 32 insertions(+), 25 deletions(-) diff --git a/include/telephony_sim.h b/include/telephony_sim.h index 74dccba..9614af0 100644 --- a/include/telephony_sim.h +++ b/include/telephony_sim.h @@ -85,10 +85,10 @@ typedef enum { * otherwise a negative error value * * @retval #TELEPHONY_ERROR_NONE Successful - * @retval #TELEPHONY_ERROR_INVALID_PARAMETER Out of memory + * @retval #TELEPHONY_ERROR_INVALID_PARAMETER Invalid parameter * @retval #TELEPHONY_ERROR_PERMISSION_DENIED Permission denied * @retval #TELEPHONY_ERROR_NOT_SUPPORTED Not supported - * @retval #TELEPHONY_ERROR_OPERATION_FAILED Invalid parameter + * @retval #TELEPHONY_ERROR_OPERATION_FAILED Operation failed * @retval #TELEPHONY_ERROR_SIM_NOT_AVAILABLE SIM is not available * * @pre The SIM state must be #TELEPHONY_SIM_STATE_AVAILABLE. @@ -114,10 +114,10 @@ int telephony_sim_get_icc_id(telephony_h handle, char **icc_id); * otherwise a negative error value * * @retval #TELEPHONY_ERROR_NONE Successful - * @retval #TELEPHONY_ERROR_INVALID_PARAMETER Out of memory + * @retval #TELEPHONY_ERROR_INVALID_PARAMETER Invalid parameter * @retval #TELEPHONY_ERROR_PERMISSION_DENIED Permission denied * @retval #TELEPHONY_ERROR_NOT_SUPPORTED Not supported - * @retval #TELEPHONY_ERROR_OPERATION_FAILED Invalid parameter + * @retval #TELEPHONY_ERROR_OPERATION_FAILED Operation failed * @retval #TELEPHONY_ERROR_SIM_NOT_AVAILABLE SIM is not available * * @pre The SIM state must be #TELEPHONY_SIM_STATE_AVAILABLE. @@ -143,10 +143,10 @@ int telephony_sim_get_operator(telephony_h handle, char **sim_operator); * otherwise a negative error value * * @retval #TELEPHONY_ERROR_NONE Successful - * @retval #TELEPHONY_ERROR_INVALID_PARAMETER Out of memory + * @retval #TELEPHONY_ERROR_INVALID_PARAMETER Invalid parameter * @retval #TELEPHONY_ERROR_PERMISSION_DENIED Permission denied * @retval #TELEPHONY_ERROR_NOT_SUPPORTED Not supported - * @retval #TELEPHONY_ERROR_OPERATION_FAILED Invalid parameter + * @retval #TELEPHONY_ERROR_OPERATION_FAILED Operation failed * @retval #TELEPHONY_ERROR_SIM_NOT_AVAILABLE SIM is not available * * @pre The SIM state must be #TELEPHONY_SIM_STATE_AVAILABLE. @@ -173,10 +173,10 @@ int telephony_sim_get_msin(telephony_h handle, char **msin); * otherwise a negative error value * * @retval #TELEPHONY_ERROR_NONE Successful - * @retval #TELEPHONY_ERROR_INVALID_PARAMETER Out of memory + * @retval #TELEPHONY_ERROR_INVALID_PARAMETER Invalid parameter * @retval #TELEPHONY_ERROR_PERMISSION_DENIED Permission denied * @retval #TELEPHONY_ERROR_NOT_SUPPORTED Not supported - * @retval #TELEPHONY_ERROR_OPERATION_FAILED Invalid parameter + * @retval #TELEPHONY_ERROR_OPERATION_FAILED Operation failed * @retval #TELEPHONY_ERROR_SIM_NOT_AVAILABLE SIM is not available * * @pre The SIM state must be #TELEPHONY_SIM_STATE_AVAILABLE. @@ -200,10 +200,10 @@ int telephony_sim_get_spn(telephony_h handle, char **spn); * otherwise a negative error value * * @retval #TELEPHONY_ERROR_NONE Successful - * @retval #TELEPHONY_ERROR_INVALID_PARAMETER Out of memory + * @retval #TELEPHONY_ERROR_INVALID_PARAMETER Invalid parameter * @retval #TELEPHONY_ERROR_PERMISSION_DENIED Permission denied * @retval #TELEPHONY_ERROR_NOT_SUPPORTED Not supported - * @retval #TELEPHONY_ERROR_OPERATION_FAILED Invalid parameter + * @retval #TELEPHONY_ERROR_OPERATION_FAILED Operation failed * @retval #TELEPHONY_ERROR_SIM_NOT_AVAILABLE SIM is not available * * @pre The SIM state must be #TELEPHONY_SIM_STATE_AVAILABLE. @@ -226,10 +226,10 @@ int telephony_sim_is_changed(telephony_h handle, bool *is_changed); * otherwise a negative error value * * @retval #TELEPHONY_ERROR_NONE Successful - * @retval #TELEPHONY_ERROR_INVALID_PARAMETER Out of memory + * @retval #TELEPHONY_ERROR_INVALID_PARAMETER Invalid parameter * @retval #TELEPHONY_ERROR_PERMISSION_DENIED Permission denied * @retval #TELEPHONY_ERROR_NOT_SUPPORTED Not supported - * @retval #TELEPHONY_ERROR_OPERATION_FAILED Invalid parameter + * @retval #TELEPHONY_ERROR_OPERATION_FAILED Operation failed */ int telephony_sim_get_state(telephony_h handle, telephony_sim_state_e *sim_state); @@ -251,10 +251,10 @@ int telephony_sim_get_state(telephony_h handle, telephony_sim_state_e *sim_state * otherwise a negative error value * * @retval #TELEPHONY_ERROR_NONE Successful - * @retval #TELEPHONY_ERROR_INVALID_PARAMETER Out of memory + * @retval #TELEPHONY_ERROR_INVALID_PARAMETER Invalid parameter * @retval #TELEPHONY_ERROR_PERMISSION_DENIED Permission denied * @retval #TELEPHONY_ERROR_NOT_SUPPORTED Not supported - * @retval #TELEPHONY_ERROR_OPERATION_FAILED Invalid parameter + * @retval #TELEPHONY_ERROR_OPERATION_FAILED Operation failed * @retval #TELEPHONY_ERROR_SIM_NOT_AVAILABLE SIM is not available * * @pre The SIM state must be #TELEPHONY_SIM_STATE_AVAILABLE. @@ -282,10 +282,10 @@ int telephony_sim_get_application_list(telephony_h handle, unsigned int *app_lis * otherwise a negative error value * * @retval #TELEPHONY_ERROR_NONE Successful - * @retval #TELEPHONY_ERROR_INVALID_PARAMETER Out of memory + * @retval #TELEPHONY_ERROR_INVALID_PARAMETER Invalid parameter * @retval #TELEPHONY_ERROR_PERMISSION_DENIED Permission denied * @retval #TELEPHONY_ERROR_NOT_SUPPORTED Not supported - * @retval #TELEPHONY_ERROR_OPERATION_FAILED Invalid parameter + * @retval #TELEPHONY_ERROR_OPERATION_FAILED Operation failed * @retval #TELEPHONY_ERROR_SIM_NOT_AVAILABLE SIM is not available * * @pre The SIM state must be #TELEPHONY_SIM_STATE_AVAILABLE. @@ -308,10 +308,10 @@ int telephony_sim_get_subscriber_number(telephony_h handle, char **subscriber_nu * @param[out] subscriber_id The subscriber ID * * @retval #TELEPHONY_ERROR_NONE Successful - * @retval #TELEPHONY_ERROR_INVALID_PARAMETER Out of memory + * @retval #TELEPHONY_ERROR_INVALID_PARAMETER Invalid parameter * @retval #TELEPHONY_ERROR_PERMISSION_DENIED Permission denied * @retval #TELEPHONY_ERROR_NOT_SUPPORTED Not supported - * @retval #TELEPHONY_ERROR_OPERATION_FAILED Invalid parameter + * @retval #TELEPHONY_ERROR_OPERATION_FAILED Operation failed * @retval #TELEPHONY_ERROR_SIM_NOT_AVAILABLE SIM is not available * * @pre The SIM state must be #TELEPHONY_SIM_STATE_AVAILABLE. @@ -336,10 +336,10 @@ int telephony_sim_get_subscriber_id(telephony_h handle, char **subscriber_id); * otherwise a negative error value * * @retval #TELEPHONY_ERROR_NONE Successful - * @retval #TELEPHONY_ERROR_INVALID_PARAMETER Out of memory + * @retval #TELEPHONY_ERROR_INVALID_PARAMETER Invalid parameter * @retval #TELEPHONY_ERROR_PERMISSION_DENIED Permission denied * @retval #TELEPHONY_ERROR_NOT_SUPPORTED Not supported - * @retval #TELEPHONY_ERROR_OPERATION_FAILED Invalid parameter + * @retval #TELEPHONY_ERROR_OPERATION_FAILED Operation failed * * @pre The SIM state must be #TELEPHONY_SIM_STATE_LOCKED. * @@ -362,10 +362,10 @@ int telephony_sim_get_lock_state(telephony_h handle, telephony_sim_lock_state_e * @param[out] gid1 The GID1 * * @retval #TELEPHONY_ERROR_NONE Successful - * @retval #TELEPHONY_ERROR_INVALID_PARAMETER Out of memory + * @retval #TELEPHONY_ERROR_INVALID_PARAMETER Invalid parameter * @retval #TELEPHONY_ERROR_PERMISSION_DENIED Permission denied * @retval #TELEPHONY_ERROR_NOT_SUPPORTED Not supported - * @retval #TELEPHONY_ERROR_OPERATION_FAILED Invalid parameter + * @retval #TELEPHONY_ERROR_OPERATION_FAILED Operation failed * @retval #TELEPHONY_ERROR_SIM_NOT_AVAILABLE SIM is not available * * @pre The SIM state must be #TELEPHONY_SIM_STATE_AVAILABLE. @@ -392,10 +392,10 @@ int telephony_sim_get_group_id1(telephony_h handle, char **gid1); * otherwise a negative error value * * @retval #TELEPHONY_ERROR_NONE Successful - * @retval #TELEPHONY_ERROR_INVALID_PARAMETER Out of memory + * @retval #TELEPHONY_ERROR_INVALID_PARAMETER Invalid parameter * @retval #TELEPHONY_ERROR_PERMISSION_DENIED Permission denied * @retval #TELEPHONY_ERROR_NOT_SUPPORTED Not supported - * @retval #TELEPHONY_ERROR_OPERATION_FAILED Invalid parameter + * @retval #TELEPHONY_ERROR_OPERATION_FAILED Operation failed * @retval #TELEPHONY_ERROR_SIM_NOT_AVAILABLE SIM is not available * * @pre The SIM state must be #TELEPHONY_SIM_STATE_AVAILABLE. diff --git a/packaging/capi-telephony.spec b/packaging/capi-telephony.spec index a98e4f1..99f7fdc 100644 --- a/packaging/capi-telephony.spec +++ b/packaging/capi-telephony.spec @@ -1,6 +1,6 @@ Name: capi-telephony Summary: Telephony Core API -Version: 0.1.60 +Version: 0.1.61 Release: 1 Group: System/Libraries License: Apache-2.0 diff --git a/src/telephony_sim.c b/src/telephony_sim.c index 3de01ab..1927bb2 100644 --- a/src/telephony_sim.c +++ b/src/telephony_sim.c @@ -249,6 +249,9 @@ int telephony_sim_get_spn(telephony_h handle, char **spn) else *spn = strdup(""); LOGI("SPN: [%s]", *spn); + } else if (result == SIM_ACCESS_FILE_NOT_FOUND) { + *spn = strdup(""); + LOGI("SPN: [%s]", *spn); } else { error_code = TELEPHONY_ERROR_OPERATION_FAILED; } @@ -420,6 +423,8 @@ int telephony_sim_get_subscriber_number(telephony_h handle, char **subscriber_nu } if (!*subscriber_number) *subscriber_number = strdup(""); + } else if (result == SIM_ACCESS_FILE_NOT_FOUND) { + *subscriber_number = strdup(""); } else { error_code = TELEPHONY_ERROR_OPERATION_FAILED; } @@ -571,6 +576,8 @@ int telephony_sim_get_group_id1(telephony_h handle, char **gid1) g_variant_iter_free(iter); g_variant_unref(inner_gv); } + } else if (result == SIM_ACCESS_FILE_NOT_FOUND) { + *gid1 = strdup(""); } else { error_code = TELEPHONY_ERROR_OPERATION_FAILED; } -- 2.7.4