Remove get_esn API

Change-Id: I740f27bbc5a1907002450745c8944cf62aec045c

diff --git a/include/telephony_modem.h b/include/telephony_modem.h
index 659fff7410add98034ca1b033747fa48421c26d7..9bafd1519b25b74e1e57def0d097eb9aaa31cc9a 100644 (file)
--- a/include/telephony_modem.h
+++ b/include/telephony_modem.h
@@ -115,29 +115,6 @@ int telephony_modem_get_power_status(telephony_h handle,
  */
 int telephony_modem_get_meid(telephony_h handle, char **meid);
 
-/**
- * @brief Gets the ESN (Electronic Serial Number) of a mobile phone. (for CDMA)
- *
- * @since_tizen 3.0
- * @privlevel public
- * @privilege %http://tizen.org/privilege/telephony
- *
- * @remarks You must release @c esn using free() on success case.
- *
- * @param[in] handle The handle from telephony_init()
- * @param[out] esn The Electronic Serial Number
- *
- * @return @c 0 on success,
- *         otherwise a negative error value
- *
- * @retval #TELEPHONY_ERROR_NONE              Successful
- * @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  Operation failed
- */
-int telephony_modem_get_esn(telephony_h handle, char **esn);
-
 /**
  * @}
  */

diff --git a/packaging/capi-telephony.spec b/packaging/capi-telephony.spec
index 368d37ba091f8cd30716b2d18caa9f1a7c9dbedd..32946c37c89ad294da5d71b92a110c9d11db5a5e 100644 (file)
--- a/packaging/capi-telephony.spec
+++ b/packaging/capi-telephony.spec
@@ -1,6 +1,6 @@
 Name:       capi-telephony
 Summary:    Telephony Core API
-Version:    0.1.53
+Version:    0.1.54
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0

diff --git a/src/telephony_modem.c b/src/telephony_modem.c
index 1d3616d59f3baa1753e817e4aa7fa053d6b8058b..ad488fc572b1bbfbdab3501962fd3f57856a6660 100644 (file)
--- a/src/telephony_modem.c
+++ b/src/telephony_modem.c
@@ -27,50 +27,6 @@
 #include "telephony_modem.h"
 #include "telephony_private.h"
 
-static int __get_serial_number(TapiHandle *tapi_h, TelMiscSNInformation *data)
-{
-       int ret = TELEPHONY_ERROR_OPERATION_FAILED;
-       GVariant *gv = NULL;
-       GError *gerr = NULL;
-
-       gv = g_dbus_connection_call_sync(tapi_h->dbus_connection,
-               DBUS_TELEPHONY_SERVICE, tapi_h->path, DBUS_TELEPHONY_MODEM_INTERFACE,
-               "GetSerialNumber", NULL, NULL, G_DBUS_CALL_FLAGS_NONE, -1, NULL, &gerr);
-
-       if (gv) {
-               int tapi_result;
-               char *tapi_esn = NULL, *tapi_meid = NULL, *tapi_imei = NULL, *tapi_imeisv = NULL;
-               g_variant_get(gv, "(issss)",
-                       &tapi_result, &tapi_esn, &tapi_meid, &tapi_imei, &tapi_imeisv);
-               if (tapi_result == 0) {
-                       ret = TELEPHONY_ERROR_NONE;
-                       g_strlcpy((gchar *)data->szEsn, tapi_esn, TAPI_MISC_ME_SN_LEN_MAX);
-                       g_strlcpy((gchar *)data->szMeid, tapi_meid, TAPI_MISC_ME_SN_LEN_MAX);
-
-                       g_free(tapi_esn);
-                       g_free(tapi_meid);
-                       g_free(tapi_imei);
-                       g_free(tapi_imeisv);
-               } else {
-                       LOGE("OPERATION_FAILED");
-                       ret = TELEPHONY_ERROR_OPERATION_FAILED;
-               }
-               g_variant_unref(gv);
-       } else {
-               LOGE("g_dbus_conn failed. error (%s)", gerr->message);
-               if (strstr(gerr->message, "AccessDenied")) {
-                       LOGE("PERMISSION_DENIED");
-                       ret = TELEPHONY_ERROR_PERMISSION_DENIED;
-               } else {
-                       LOGE("OPERATION_FAILED");
-                       ret = TELEPHONY_ERROR_OPERATION_FAILED;
-               }
-               g_error_free(gerr);
-       }
-
-       return ret;
-}
-
 int telephony_modem_get_imei(telephony_h handle, char **imei)
 {
        GVariant *gv = NULL;
@@ -162,9 +118,10 @@ int telephony_modem_get_power_status(telephony_h handle,
 
 int telephony_modem_get_meid(telephony_h handle, char **meid)
 {
-       int ret;
+       int ret = TELEPHONY_ERROR_OPERATION_FAILED;
        TapiHandle *tapi_h;
-       TelMiscSNInformation data;
+       GVariant *gv = NULL;
+       GError *gerr = NULL;
 
        CHECK_TELEPHONY_SUPPORTED(TELEPHONY_FEATURE);
        CHECK_INPUT_PARAMETER(handle);
@@ -172,37 +129,38 @@ int telephony_modem_get_meid(telephony_h handle, char **meid)
        CHECK_INPUT_PARAMETER(tapi_h);
        CHECK_INPUT_PARAMETER(meid);
 
-       ret = __get_serial_number(tapi_h, &data);
-       if (ret == TELEPHONY_ERROR_NONE) {
-               if (strlen((gchar *)data.szMeid) != 0)
-                       *meid = strdup((gchar *)data.szMeid);
-               else
-                       *meid = NULL;
-               LOGI("MEID:[%s]", *meid);
-       }
-
-       return ret;
-}
+       gv = g_dbus_connection_call_sync(tapi_h->dbus_connection,
+               DBUS_TELEPHONY_SERVICE, tapi_h->path, DBUS_TELEPHONY_MODEM_INTERFACE,
+               "GetSerialNumber", NULL, NULL, G_DBUS_CALL_FLAGS_NONE, -1, NULL, &gerr);
 
-int telephony_modem_get_esn(telephony_h handle, char **esn)
-{
-       int ret;
-       TapiHandle *tapi_h;
-       TelMiscSNInformation data;
+       if (gv) {
+               int tapi_result;
+               char *tapi_esn = NULL, *tapi_meid = NULL, *tapi_imei = NULL, *tapi_imeisv = NULL;
+               g_variant_get(gv, "(issss)",
+                       &tapi_result, &tapi_esn, &tapi_meid, &tapi_imei, &tapi_imeisv);
+               if (tapi_result == 0) {
+                       ret = TELEPHONY_ERROR_NONE;
+                       *meid = strdup(tapi_meid);
 
-       CHECK_TELEPHONY_SUPPORTED(TELEPHONY_FEATURE);
-       CHECK_INPUT_PARAMETER(handle);
-       tapi_h = ((telephony_data *)handle)->tapi_h;
-       CHECK_INPUT_PARAMETER(tapi_h);
-       CHECK_INPUT_PARAMETER(esn);
-
-       ret = __get_serial_number(tapi_h, &data);
-       if (ret == TELEPHONY_ERROR_NONE) {
-               if (strlen((gchar *)data.szEsn) != 0)
-                       *esn = strdup((gchar *)data.szEsn);
-               else
-                       *esn = NULL;
-               LOGI("ESN:[%s]", *esn);
+                       g_free(tapi_esn);
+                       g_free(tapi_meid);
+                       g_free(tapi_imei);
+                       g_free(tapi_imeisv);
+               } else {
+                       LOGE("OPERATION_FAILED");
+                       ret = TELEPHONY_ERROR_OPERATION_FAILED;
+               }
+               g_variant_unref(gv);
+       } else {
+               LOGE("g_dbus_conn failed. error (%s)", gerr->message);
+               if (strstr(gerr->message, "AccessDenied")) {
+                       LOGE("PERMISSION_DENIED");
+                       ret = TELEPHONY_ERROR_PERMISSION_DENIED;
+               } else {
+                       LOGE("OPERATION_FAILED");
+                       ret = TELEPHONY_ERROR_OPERATION_FAILED;
+               }
+               g_error_free(gerr);
        }
 
        return ret;

diff --git a/test/test_all_api.c b/test/test_all_api.c
index bf2901195b5e09e5ae997666329dc021cb6d099d..9596ddf6ec659be4bbc7f52ab29acc2fc76fbc50 100644 (file)
--- a/test/test_all_api.c
+++ b/test/test_all_api.c
@@ -355,7 +355,6 @@ int main()
        /* Modem value */
        char *imei = NULL;
        char *meid = NULL;
-       char *esn = NULL;
        telephony_modem_power_status_e power_status = 0;
 
        /* Ready */
@@ -661,14 +660,6 @@ int main()
                free(meid);
        }
 
-       ret_value = telephony_modem_get_esn(handle_list.handle[0], &esn);
-       if (ret_value != TELEPHONY_ERROR_NONE) {
-               LOGE("telephony_modem_get_esn() failed!!! [%d]", ret_value);
-       } else {
-               LOGI("ESN is [%s]", esn);
-               free(esn);
-       }
-
        /* set_noti_cb */
        for (i = 0; i < (sizeof(sim_noti_tbl) / sizeof(int)); i++) {
                ret_value = telephony_set_noti_cb(handle_list.handle[0], sim_noti_tbl[i], sim_noti_cb, NULL);