Build break fix due to STC API change

Change-Id: I329a84a16d02fbdfcac5803038c1c819eb9a48a0
Signed-off-by: Radek Kintop <r.kintop@samsung.com>

diff --git a/setting-smartmanager/smartmanager-data/include/smartmanager-data.h b/setting-smartmanager/smartmanager-data/include/smartmanager-data.h
index a6fea338b381ff7072f9427df2afa9fe6d7024c9..43a89ff6e9ef08361a9b134f487271f0e3d3a6a2 100755 (executable)
--- a/setting-smartmanager/smartmanager-data/include/smartmanager-data.h
+++ b/setting-smartmanager/smartmanager-data/include/smartmanager-data.h
@@ -77,8 +77,8 @@ typedef struct {
        telephony_handle_list_s telephony_handles;
        int num_sim_cards_available; /* Number of SIM cards available.
                                                                        Necessary for the main view. */
-       char imsi_1[15 + 1]; /* IMSI numbers of sim cards*/
-       char imsi_2[15 + 1];
+       char *subscriber_id_1; /* Subscriber ID numbers of sim cards*/
+       char *subscriber_id_2;
 
        /* These are lists of application items *
         * returned by Data Usage API (model).
@@ -144,7 +144,7 @@ typedef struct {
        /* Mobile view data usage settings: */
        setting_view *mobile_view;
        Evas_Object *mobile_data_setting_genlist;
-       const char *selected_sim_imsi;
+       const char *selected_sim_subscriber_id;
        Data_Limits_T *selected_sim_limits;
 
        /* Data statistics and settings: */

diff --git a/setting-smartmanager/smartmanager-data/include/smartmanager-utils.h b/setting-smartmanager/smartmanager-data/include/smartmanager-utils.h
index e94908115c386998fd28bf0a19a20de94ebb70e0..d9b8917f20b7d786b339701cc4c61b234b0922f5 100644 (file)
--- a/setting-smartmanager/smartmanager-data/include/smartmanager-utils.h
+++ b/setting-smartmanager/smartmanager-data/include/smartmanager-utils.h
@@ -47,14 +47,14 @@ bool get_sim_apps_list(stc_h stc, stc_stats_info_cb stats_cb);
 bool get_wifi_apps_list(stc_h stc, stc_stats_info_cb stats_cb);
 bool get_sim_restrictions(stc_h stc, stc_restriction_info_cb restrictions_cb);
 bool get_wifi_restrictions(stc_h stc, stc_restriction_info_cb restrictions_cb);
-bool get_imsi_from_telephony_handle(telephony_h handle,
-                                                                       char out_buff[], int len_max);
-bool compare_imsis(const char *imsi_a, const char *imsi_b);
+bool get_subscriber_id_from_telephony_handle(telephony_h handle,
+                                                                                               char **subscriber_id);
+bool compare_subscriber_ids(const char *id_a, const char *id_b);
 
-restrictions_result set_mobile_limit_restrictions(stc_h stc_handle, const char *imsi, int64_t limit, int64_t warning_limit);
+restrictions_result set_mobile_limit_restrictions(stc_h stc_handle, const char *subscriber_id, int64_t limit, int64_t warning_limit);
 restrictions_result set_mobile_restriction_rule_parameters(
                                                                                        stc_restriction_rule_h rule,
-                                                                                       const char *imsi, int64_t limit,
+                                                                                       const char *subscriber_id, int64_t limit,
                                                                                        int64_t warning_limit);
 bool unset_mobile_limit_restrictions(stc_h stc_handle, stc_restriction_info_cb restrictions_cb, void *data);
 

diff --git a/setting-smartmanager/smartmanager-data/src/smartmanager-data-main-view.c b/setting-smartmanager/smartmanager-data/src/smartmanager-data-main-view.c
index de3bdf7481409bf3996ad239928f1a0a403e624c..60aad9715a7a1d7a695016952af59d9f99bee26f 100755 (executable)
--- a/setting-smartmanager/smartmanager-data/src/smartmanager-data-main-view.c
+++ b/setting-smartmanager/smartmanager-data/src/smartmanager-data-main-view.c
@@ -171,13 +171,13 @@ static void _data_usage_sett_click_cb(void *data, Evas_Object *obj,
        elm_genlist_item_selected_set(event_info, EINA_FALSE);
 
        if (event_info == ad->item_sim_1_data_usage_set) {
-               ad->selected_sim_imsi = ad->imsi_1;
+               ad->selected_sim_subscriber_id = ad->subscriber_id_1;
                ad->selected_sim_limits = &ad->sim_1_limits;
                setting_view_change(&smartmanager_view_data_main, ad->mobile_view, ad);
        }
 
        if (event_info == ad->item_sim_2_data_usage_set) {
-               ad->selected_sim_imsi = ad->imsi_2;
+               ad->selected_sim_subscriber_id = ad->subscriber_id_2;
                ad->selected_sim_limits = &ad->sim_2_limits;
                setting_view_change(&smartmanager_view_data_main, ad->mobile_view, ad);
        }

diff --git a/setting-smartmanager/smartmanager-data/src/smartmanager-data-usage-mobile-settings.c b/setting-smartmanager/smartmanager-data/src/smartmanager-data-usage-mobile-settings.c
index fa9cf23f67236c40ba7569f07cafda5d65826407..8c5ee3cc88e4a274ea1a4366419c61c7c5762081 100755 (executable)
--- a/setting-smartmanager/smartmanager-data/src/smartmanager-data-usage-mobile-settings.c
+++ b/setting-smartmanager/smartmanager-data/src/smartmanager-data-usage-mobile-settings.c
@@ -140,7 +140,6 @@ static Elm_Entry_Filter_Limit_Size limit_size = {
 
 static void _update_genlist_limit_item(Element_Type_E element_type, SmartMgrData *smd)
 {
-       SETTING_TRACE_BEGIN;
        int64_t value = 0;
        Element *element = &elements[element_type];
        char buf[256];
@@ -162,7 +161,6 @@ static void _update_genlist_limit_item(Element_Type_E element_type, SmartMgrData
        SETTING_TRACE_DEBUG("GENLIST DATA UPDATE: %s", element->value);
 
        elm_genlist_realized_items_update(smd->mobile_data_setting_genlist);
-       SETTING_TRACE_END;
 }
 
 void complement_data_usage_mobile_genlist(Evas_Object *mobile_genlist, SmartMgrData *smd)
@@ -218,7 +216,6 @@ void complement_data_usage_mobile_genlist(Evas_Object *mobile_genlist, SmartMgrD
 
 static Evas_Object *_create_popup_button(Evas_Object *parent, char *part, char *title, float weight_x, float weight_y, Evas_Smart_Cb cb, void *callback_data)
 {
-       SETTING_TRACE_BEGIN;
        Evas_Object *btn = elm_button_add(parent);
        if (!btn) {
                SETTING_TRACE_ERROR("btn == NULL");
@@ -236,13 +233,11 @@ static Evas_Object *_create_popup_button(Evas_Object *parent, char *part, char *
 
        evas_object_show(btn);
 
-       SETTING_TRACE_END;
        return btn;
 }
 
 static void _entry_set_displayed_value(Limit_Popup_Data_T *limit_popup_data)
 {
-       SETTING_TRACE_BEGIN;
        float to_display = 0;
        char buf[256];
        int64_t value = 0;
@@ -265,12 +260,10 @@ static void _entry_set_displayed_value(Limit_Popup_Data_T *limit_popup_data)
 
        snprintf(buf, sizeof(buf), "%.2f", to_display);
        elm_object_text_set(limit_popup_data->content, buf);
-       SETTING_TRACE_END;
 }
 
 static void _data_unit_type_cb(void *data, Evas_Object *obj, void *event_info)
 {
-       SETTING_TRACE_BEGIN;
        Limit_Popup_Data_T *limit_popup_data = (Limit_Popup_Data_T *)data;
        ret_if(!limit_popup_data);
 
@@ -291,8 +284,6 @@ static void _data_unit_type_cb(void *data, Evas_Object *obj, void *event_info)
        default:
                SETTING_TRACE_ERROR("Unkonw unit");
        }
-
-       SETTING_TRACE_END;
 }
 
 static void create_toast_popup(Evas_Object *parent, char *text)
@@ -309,7 +300,7 @@ static stc_callback_ret_e _get_and_unset_limit_restrictions_cb(stc_error_e resul
 {
        int ret = STC_ERROR_NONE;
        char *app_id = NULL;
-       char *imsi = NULL;
+       char *subscriber_id = NULL;
        int64_t limit = 0;
        int64_t warning_limit = 0;
        stc_iface_type_e iface_type = STC_IFACE_UNKNOWN;
@@ -350,14 +341,14 @@ static stc_callback_ret_e _get_and_unset_limit_restrictions_cb(stc_error_e resul
        if (iface_type != STC_IFACE_DATACALL)
                return STC_CALLBACK_CONTINUE;
 
-       ret = stc_restriction_info_get_subscriber_id(info, &imsi);
+       ret = stc_restriction_info_get_subscriber_id(info, &subscriber_id);
        if (STC_ERROR_NONE != ret) {
                SETTING_TRACE_ERROR("stc_restriction_info_get_subscriber_id error: %s",
                                                                        get_error_message(ret));
                return STC_CALLBACK_CONTINUE;
        }
 
-       if (compare_imsis(smd->selected_sim_imsi, imsi)) {
+       if (compare_subscriber_ids(smd->selected_sim_subscriber_id, subscriber_id)) {
                ret = stc_restriction_info_get_limit(info, &limit);
                if (STC_ERROR_NONE != ret) {
                        SETTING_TRACE_ERROR("stc_restriction_info_get_limit() error: %s",
@@ -379,7 +370,7 @@ static stc_callback_ret_e _get_and_unset_limit_restrictions_cb(stc_error_e resul
                        return STC_CALLBACK_CONTINUE;
                }
 
-               restrictions_res = set_mobile_restriction_rule_parameters(rule, imsi, limit, warning_limit);
+               restrictions_res = set_mobile_restriction_rule_parameters(rule, subscriber_id, limit, warning_limit);
                if (restrictions_res != RESTRICTIONS_OK) {
                        SETTING_TRACE_ERROR("set_mobile_restriction_rule_parameters() error");
                        return STC_CALLBACK_CONTINUE;
@@ -392,7 +383,7 @@ static stc_callback_ret_e _get_and_unset_limit_restrictions_cb(stc_error_e resul
                        return STC_CALLBACK_CONTINUE;
                }
 
-               free(imsi);
+               free(subscriber_id);
        }
 
        SETTING_TRACE_ERROR("stc_unset_restriction() successful unset restriction");
@@ -402,7 +393,6 @@ static stc_callback_ret_e _get_and_unset_limit_restrictions_cb(stc_error_e resul
 
 static void _popup_done_cb(void *data, Evas_Object *obj, void *event_info)
 {
-       SETTING_TRACE_BEGIN;
        Limit_Popup_Data_T *limit_popup_data = (Limit_Popup_Data_T *)data;
        ret_if(!limit_popup_data);
 
@@ -431,7 +421,7 @@ static void _popup_done_cb(void *data, Evas_Object *obj, void *event_info)
                } else {
                        res = set_mobile_limit_restrictions(
                                                limit_popup_data->smd->stc,
-                                               limit_popup_data->smd->selected_sim_imsi,
+                                               limit_popup_data->smd->selected_sim_subscriber_id,
                                                limit_popup_data->smd->selected_sim_limits->limit,
                                                (int64_t)value);
                }
@@ -442,7 +432,7 @@ static void _popup_done_cb(void *data, Evas_Object *obj, void *event_info)
                } else {
                        res = set_mobile_limit_restrictions(
                                                limit_popup_data->smd->stc,
-                                               limit_popup_data->smd->selected_sim_imsi,
+                                               limit_popup_data->smd->selected_sim_subscriber_id,
                                                (int64_t)value,
                                                limit_popup_data->smd->selected_sim_limits->warning);
                }
@@ -471,21 +461,16 @@ static void _popup_done_cb(void *data, Evas_Object *obj, void *event_info)
 
                evas_object_del(limit_popup_data->popup);
        }
-
-       SETTING_TRACE_END;
 }
 
 static void _popup_cancel_cb(void *data, Evas_Object *obj, void *event_info)
 {
-       SETTING_TRACE_BEGIN;
        Evas_Object *popup = (Evas_Object *)data;
        evas_object_del(popup);
-       SETTING_TRACE_END;
 }
 
 static void _clean_entry_cb(void *data, Evas_Object *obj, void *event_info)
 {
-       SETTING_TRACE_BEGIN;
        Evas_Object *entry = (Evas_Object *)data;
 
        if (!entry) {
@@ -494,12 +479,10 @@ static void _clean_entry_cb(void *data, Evas_Object *obj, void *event_info)
        }
 
        elm_object_text_set(entry, "");
-       SETTING_TRACE_END;
 }
 
 static Evas_Object *_create_entry(Evas_Object *parent, Element_Type_E type)
 {
-       SETTING_TRACE_BEGIN;
        Evas_Object *entry = elm_entry_add(parent);
        if (!entry) {
                dlog_print(DLOG_ERROR, LOG_TAG, "[%s:%d] entry == NULL", __FILE__, __LINE__);
@@ -515,13 +498,11 @@ static Evas_Object *_create_entry(Evas_Object *parent, Element_Type_E type)
        evas_object_size_hint_align_set(entry, EVAS_HINT_FILL, EVAS_HINT_FILL);
        evas_object_show(entry);
 
-       SETTING_TRACE_END;
        return entry;
 }
 
 Evas_Object *_create_label(Evas_Object *parent, char *title)
 {
-       SETTING_TRACE_BEGIN;
        Evas_Object *label = elm_label_add(parent);
        if (!label) {
                dlog_print(DLOG_ERROR, LOG_TAG, "[%s:%d] label == NULL", __FILE__, __LINE__);
@@ -531,13 +512,11 @@ Evas_Object *_create_label(Evas_Object *parent, char *title)
        elm_object_text_set(label, title);
        evas_object_show(label);
 
-       SETTING_TRACE_END;
        return label;
 }
 
 Evas_Object *_create_box(Evas_Object *parent)
 {
-       SETTING_TRACE_BEGIN;
        Evas_Object *box = elm_box_add(parent);
 
        if (!box) {
@@ -549,13 +528,11 @@ Evas_Object *_create_box(Evas_Object *parent)
        elm_object_content_set(parent, box);
        evas_object_show(box);
 
-       SETTING_TRACE_END;
        return box;
 }
 
 Evas_Object *_create_datetime(Evas_Object *parent, time_t start_date)
 {
-       SETTING_TRACE_BEGIN;
        Evas_Object *datetime = elm_datetime_add(parent);
        elm_object_style_set(datetime, "date_layout");
        elm_datetime_format_set(datetime, "%d/%b/%Y");
@@ -564,13 +541,11 @@ Evas_Object *_create_datetime(Evas_Object *parent, time_t start_date)
 
        evas_object_show(datetime);
 
-       SETTING_TRACE_END;
        return datetime;
 }
 
 Evas_Object *_create_popup(SmartMgrData *smd, char *title)
 {
-       SETTING_TRACE_BEGIN;
        Evas_Object *popup = elm_popup_add(smd->md.window);
        if (!popup) {
                dlog_print(DLOG_ERROR, LOG_TAG, "[%s:%d] popup == NULL", __FILE__, __LINE__);
@@ -581,13 +556,11 @@ Evas_Object *_create_popup(SmartMgrData *smd, char *title)
        elm_popup_align_set(popup, 0.5, 0.5);
        eext_object_event_callback_add(popup, EEXT_CALLBACK_BACK, _popup_cancel_cb, popup);
 
-       SETTING_TRACE_END;
        return popup;
 }
 
 static Limit_Popup_Data_T *_create_limit_popup_data(Evas_Object *popup, Evas_Object *entry, SmartMgrData *smd, Element_Type_E type)
 {
-       SETTING_TRACE_BEGIN;
        Limit_Popup_Data_T *limit_popup_data = calloc(1, sizeof(Limit_Popup_Data_T));
        if (!limit_popup_data) {
                dlog_print(DLOG_ERROR, LOG_TAG, "[%s:%d] limit_popup_data == NULL", __FILE__, __LINE__);
@@ -600,36 +573,29 @@ static Limit_Popup_Data_T *_create_limit_popup_data(Evas_Object *popup, Evas_Obj
        limit_popup_data->popup = popup;
        limit_popup_data->content = entry;
 
-       SETTING_TRACE_END;
        return limit_popup_data;
 }
 
 static void _popup_del_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
-       SETTING_TRACE_BEGIN;
        Limit_Popup_Data_T *limit_popup_data = (Limit_Popup_Data_T *)data;
        ret_if(!limit_popup_data);
 
        _update_genlist_limit_item(limit_popup_data->element_type, limit_popup_data->smd);
 
        free(limit_popup_data);
-
-       SETTING_TRACE_END;
 }
 
 static void _custom_cycle_popup_cancel_cb(void *data, Evas_Object *obj,
                void *event_info)
 {
-       SETTING_TRACE_BEGIN;
        Evas_Object *popup = (Evas_Object *)data;
        evas_object_del(popup);
-       SETTING_TRACE_END;
 }
 
 static void _custom_cycle_popup_ok_cb(void *data, Evas_Object *obj,
                void *event_info)
 {
-       SETTING_TRACE_BEGIN;
        bool res = false;
        int value = 0;
        Cycle_Start_Popup_Data_T *cycle_start_popup_data =
@@ -660,35 +626,28 @@ static void _custom_cycle_popup_ok_cb(void *data, Evas_Object *obj,
                }
        }
 
-       if (cycle_start_popup_data->smd->selected_sim_imsi == cycle_start_popup_data->smd->imsi_1)  {
+       if (cycle_start_popup_data->smd->selected_sim_subscriber_id == cycle_start_popup_data->smd->subscriber_id_1)  {
                res = write_sim_1_cycle_interval(cycle_start_popup_data->smd->selected_sim_limits->custom_mode_interval);
-       } else if (cycle_start_popup_data->smd->selected_sim_imsi == cycle_start_popup_data->smd->imsi_2)  {
+       } else if (cycle_start_popup_data->smd->selected_sim_subscriber_id == cycle_start_popup_data->smd->subscriber_id_2)  {
                res = write_sim_2_cycle_interval(cycle_start_popup_data->smd->selected_sim_limits->custom_mode_interval);
        }
 
        ret_if(!res);
-
-       SETTING_TRACE_END;
 }
 
 static void _custom_cycle_popup_del_cb(void *data, Evas *e, Evas_Object *obj,
                void *event_info)
 {
-       SETTING_TRACE_BEGIN;
-
        Cycle_Start_Popup_Data_T *cycle_start_popup_data =
                        (Cycle_Start_Popup_Data_T *)data;
 
        free(cycle_start_popup_data);
-
-       SETTING_TRACE_END;
 }
 
 static void _create_custom_cycle_popup(SmartMgrData *smd, char *title,
                int days)
 {
        char buf[256] = {0};
-       SETTING_TRACE_BEGIN;
        Evas_Object *popup = _create_popup(smd, title);
        Evas_Object *box = _create_box(popup);
        Evas_Object *entry = _create_entry(box, ELEMENT_TYPE_CYCLE);
@@ -717,16 +676,13 @@ static void _create_custom_cycle_popup(SmartMgrData *smd, char *title,
        evas_object_event_callback_add(popup, EVAS_CALLBACK_DEL,
                        _custom_cycle_popup_del_cb, cycle_start_popup_data);
        evas_object_show(popup);
-       SETTING_TRACE_END;
 }
 
 static void _custom_start_date_popup_cancel_cb(void *data, Evas_Object *obj,
                void *event_info)
 {
-       SETTING_TRACE_BEGIN;
        Evas_Object *popup = (Evas_Object *)data;
        evas_object_del(popup);
-       SETTING_TRACE_END;
 }
 
 static struct tm _get_margin_date(margin_date_type date_type)
@@ -749,7 +705,6 @@ static struct tm _get_margin_date(margin_date_type date_type)
 static void _custom_start_date_popup_ok_cb(void *data, Evas_Object *obj,
                void *event_info)
 {
-       SETTING_TRACE_BEGIN;
        bool res = false;
        char buf[256] = {0};
        char margin_date_buf[256] = {0};
@@ -782,34 +737,27 @@ static void _custom_start_date_popup_ok_cb(void *data, Evas_Object *obj,
                evas_object_del(cycle_start_popup_data->popup);
        }
 
-       if (cycle_start_popup_data->smd->selected_sim_imsi == cycle_start_popup_data->smd->imsi_1)  {
+       if (cycle_start_popup_data->smd->selected_sim_subscriber_id == cycle_start_popup_data->smd->subscriber_id_1)  {
                res = write_sim_1_cycle_start(cycle_start_popup_data->smd->selected_sim_limits->cycle_start);
-       } else if (cycle_start_popup_data->smd->selected_sim_imsi == cycle_start_popup_data->smd->imsi_2)  {
+       } else if (cycle_start_popup_data->smd->selected_sim_subscriber_id == cycle_start_popup_data->smd->subscriber_id_2)  {
                res = write_sim_2_cycle_start(cycle_start_popup_data->smd->selected_sim_limits->cycle_start);
        }
 
        ret_if(!res);
-
-       SETTING_TRACE_END;
 }
 
 static void _custom_start_date_popup_del_cb(void *data, Evas *e, Evas_Object *obj,
                void *event_info)
 {
-       SETTING_TRACE_BEGIN;
-
        Cycle_Start_Popup_Data_T *cycle_start_popup_data =
                        (Cycle_Start_Popup_Data_T *)data;
 
        free(cycle_start_popup_data);
-
-       SETTING_TRACE_END;
 }
 
 static void create_custom_start_date_popup(SmartMgrData *smd, char *title,
                int time)
 {
-       SETTING_TRACE_BEGIN;
        Cycle_Start_Popup_Data_T *cycle_start_popup_data = calloc(1, sizeof(Cycle_Start_Popup_Data_T));
        ret_if(!cycle_start_popup_data);
 
@@ -831,12 +779,10 @@ static void create_custom_start_date_popup(SmartMgrData *smd, char *title,
                                _custom_start_date_popup_del_cb, cycle_start_popup_data);
 
        evas_object_show(popup);
-       SETTING_TRACE_END;
 }
 
 static bool _create_limit_popup(SmartMgrData *smd, char *title, Element_Type_E type)
 {
-       SETTING_TRACE_BEGIN;
        Evas_Object *popup = _create_popup(smd, title);
        Evas_Object *box   = _create_box(popup);
        Evas_Object *entry = _create_entry(box, type);
@@ -861,7 +807,6 @@ static bool _create_limit_popup(SmartMgrData *smd, char *title, Element_Type_E t
        evas_object_event_callback_add(popup, EVAS_CALLBACK_DEL, _popup_del_cb, limit_popup_data);
        evas_object_show(popup);
 
-       SETTING_TRACE_END;
        return true;
 }
 
@@ -869,8 +814,6 @@ static Elm_Widget_Item *_append_item_to_radio_list(SmartMgrData *smd, Evas_Objec
                const char *text, int radio_value, bool is_first,
                Evas_Smart_Cb select_cb)
 {
-       SETTING_TRACE_BEGIN;
-
        Radio_List_Item_T *item_data = calloc(1, sizeof(Radio_List_Item_T));
        if (!item_data) {
                SETTING_TRACE_ERROR("item_data == NULL");
@@ -890,14 +833,12 @@ static Elm_Widget_Item *_append_item_to_radio_list(SmartMgrData *smd, Evas_Objec
                return NULL;
        }
 
-       SETTING_TRACE_END;
        return item;
 }
 
 static void _update_genlist_cycle_item(SmartMgrData *smd)
 {
        char buf[256] = {0};
-       SETTING_TRACE_BEGIN;
 
        free(elements[ELEMENT_TYPE_CYCLE].value);
 
@@ -910,14 +851,10 @@ static void _update_genlist_cycle_item(SmartMgrData *smd)
 
        SETTING_TRACE_DEBUG("GENLIST DATA UPDATE: %s", elements[ELEMENT_TYPE_CYCLE].value);
        elm_genlist_realized_items_update(smd->mobile_data_setting_genlist);
-
-       SETTING_TRACE_END;
 }
 
 static void _update_genlist_start_date_item(SmartMgrData *smd)
 {
-       SETTING_TRACE_BEGIN;
-
        char buf[256] = {0};
        struct tm min_date = {0};
 
@@ -953,28 +890,20 @@ static void _update_genlist_start_date_item(SmartMgrData *smd)
        }
 
        elm_genlist_realized_items_update(smd->mobile_data_setting_genlist);
-
-       SETTING_TRACE_END;
 }
 
 static void _update_genlist_info_item(SmartMgrData *smd)
 {
-       SETTING_TRACE_BEGIN;
-
        free(elements[ELEMENT_TYPE_INFO].value);
 
        elements[ELEMENT_TYPE_INFO].value = strdup(elements_info_initial_values[smd->selected_sim_limits->cycle_mode-1]);
        SETTING_TRACE_DEBUG("GENLIST DATA UPDATE: %s", elements[ELEMENT_TYPE_INFO].value);
 
        elm_genlist_realized_items_update(smd->mobile_data_setting_genlist);
-
-       SETTING_TRACE_END;
 }
 
 static void _timer_popup_done_cb(void *data, Evas_Object *obj, void *event_info)
 {
-       SETTING_TRACE_BEGIN;
-
        Cycle_Start_Popup_Data_T *cycle_start_data =
                        (Cycle_Start_Popup_Data_T *)data;
        char buf[256];
@@ -990,24 +919,16 @@ static void _timer_popup_done_cb(void *data, Evas_Object *obj, void *event_info)
        elm_genlist_realized_items_update(
                        cycle_start_data->smd->mobile_data_setting_genlist);
        evas_object_del(cycle_start_data->popup);
-
-       SETTING_TRACE_END;
 }
 
 static void _timer_popup_cancel_cb(void *data, Evas_Object *obj, void *event_info)
 {
-       SETTING_TRACE_BEGIN;
-
        Cycle_Start_Popup_Data_T *cycle_start_data = (Cycle_Start_Popup_Data_T *)data;
        evas_object_del(cycle_start_data->popup);
-
-       SETTING_TRACE_END;
 }
 
 static void _create_timer_popup(SmartMgrData *smd, char *title, int start_day)
 {
-       SETTING_TRACE_BEGIN;
-
        Evas_Object *date_time = NULL;
        Cycle_Start_Popup_Data_T *cycle_start_data = calloc(1, sizeof(Limit_Popup_Data_T));
 
@@ -1039,39 +960,29 @@ static void _create_timer_popup(SmartMgrData *smd, char *title, int start_day)
        elm_spinner_interval_set(date_time, 1.0);
 
        elm_object_content_set(cycle_start_data->popup, date_time);
-
-       SETTING_TRACE_END;
 }
 
 static char *_genlist_radio_text_get(void *data, Evas_Object *obj, const char *part)
 {
-       SETTING_TRACE_BEGIN;
-
        int len = strlen("elm.text");
        Radio_List_Item_T *item_data = (Radio_List_Item_T *)data;
 
        if (len != strlen(part) || strncmp("elm.text", part, len))
                return NULL;
 
-       SETTING_TRACE_END;
        return strdup(item_data->text);
 }
 
 static void _genlist_radio_del(void *data, Evas_Object *obj)
 {
-       SETTING_TRACE_BEGIN;
-
        Radio_List_Item_T *item_data = (Radio_List_Item_T *)data;
        free(item_data->text);
        free(item_data);
 
-       SETTING_TRACE_END;
 }
 
 static Elm_Gen_Item_Class *_create_genlist_1_line_class(Elm_Gen_Item_Content_Get_Cb _genlist_radio_content_get)
 {
-       SETTING_TRACE_BEGIN;
-
        Elm_Gen_Item_Class *itc = elm_genlist_item_class_new();
        if (!itc) {
                SETTING_TRACE_ERROR("itc == NULL");
@@ -1082,15 +993,11 @@ static Elm_Gen_Item_Class *_create_genlist_1_line_class(Elm_Gen_Item_Content_Get
        itc->func.content_get = _genlist_radio_content_get;
        itc->func.text_get = _genlist_radio_text_get;
        itc->func.del = _genlist_radio_del;
-
-       SETTING_TRACE_END;
        return itc;
 }
 
 static void _radio_cycle_selected_cb(void *data, Evas_Object *obj, void *event_info)
 {
-       SETTING_TRACE_BEGIN;
-
        bool res = false;
        Radio_List_Item_T *item_data = (Radio_List_Item_T *)data;
 
@@ -1106,21 +1013,18 @@ static void _radio_cycle_selected_cb(void *data, Evas_Object *obj, void *event_i
 
        evas_object_del(item_data->popup);
 
-       if (item_data->smd->selected_sim_imsi == item_data->smd->imsi_1)  {
+       if (item_data->smd->selected_sim_subscriber_id == item_data->smd->subscriber_id_1)  {
                res = write_sim_1_cycle_mode(item_data->smd->selected_sim_limits->cycle_mode);
-       } else if (item_data->smd->selected_sim_imsi == item_data->smd->imsi_2) {
+       } else if (item_data->smd->selected_sim_subscriber_id == item_data->smd->subscriber_id_2) {
                res = write_sim_2_cycle_mode(item_data->smd->selected_sim_limits->cycle_mode);
        }
 
        ret_if(!res);
 
-       SETTING_TRACE_END;
 }
 
 static Evas_Object *_genlist_cycle_radio_content_get(void *data, Evas_Object *obj, const char *part)
 {
-       SETTING_TRACE_BEGIN;
-
        int len = strlen("elm.swallow.end");
        Evas_Object *radio = NULL;
        Radio_List_Item_T *item_data = (Radio_List_Item_T *)data;
@@ -1140,14 +1044,11 @@ static Evas_Object *_genlist_cycle_radio_content_get(void *data, Evas_Object *ob
        if (item_data->smd->selected_sim_limits->cycle_mode == item_data->radio_value)
                elm_radio_value_set(radio, item_data->radio_value);
 
-       SETTING_TRACE_END;
        return radio;
 }
 
 static void _radio_start_date_selected_cb(void *data, Evas_Object *obj, void *event_info)
 {
-       SETTING_TRACE_BEGIN;
-
        Radio_List_Item_T *item_data = (Radio_List_Item_T *)data;
 
        item_data->smd->selected_sim_limits->cycle_start = item_data->radio_value;
@@ -1155,13 +1056,10 @@ static void _radio_start_date_selected_cb(void *data, Evas_Object *obj, void *ev
 
        evas_object_del(item_data->popup);
 
-       SETTING_TRACE_END;
 }
 
 static Evas_Object *_genlist_start_date_radio_content_get(void *data, Evas_Object *obj, const char *part)
 {
-       SETTING_TRACE_BEGIN;
-
        int len = strlen("elm.swallow.end");
        Evas_Object *radio = NULL;
        Radio_List_Item_T *item_data = (Radio_List_Item_T *)data;
@@ -1181,14 +1079,11 @@ static Evas_Object *_genlist_start_date_radio_content_get(void *data, Evas_Objec
        if (item_data->smd->selected_sim_limits->cycle_start == item_data->radio_value)
                elm_radio_value_set(radio, item_data->radio_value);
 
-       SETTING_TRACE_END;
        return radio;
 }
 
 void _radio_cycle_list_item_selected_cb(void *data, Evas_Object *obj, void *event_info)
 {
-       SETTING_TRACE_BEGIN;
-
        bool res = false;
        Radio_List_Item_T *item_data = (Radio_List_Item_T *)data;
 
@@ -1204,33 +1099,26 @@ void _radio_cycle_list_item_selected_cb(void *data, Evas_Object *obj, void *even
 
        evas_object_del(item_data->popup);
 
-       if (item_data->smd->selected_sim_imsi == item_data->smd->imsi_1)  {
+       if (item_data->smd->selected_sim_subscriber_id == item_data->smd->subscriber_id_1)  {
                res = write_sim_1_cycle_mode(item_data->smd->selected_sim_limits->cycle_mode);
-       } else if (item_data->smd->selected_sim_imsi == item_data->smd->imsi_2) {
+       } else if (item_data->smd->selected_sim_subscriber_id == item_data->smd->subscriber_id_2) {
                res = write_sim_2_cycle_mode(item_data->smd->selected_sim_limits->cycle_mode);
        }
 
        ret_if(!res);
-
-       SETTING_TRACE_END;
 }
 
 void _radio_start_date_list_item_selected_cb(void *data, Evas_Object *obj, void *event_info)
 {
-       SETTING_TRACE_BEGIN;
-
        Radio_List_Item_T *item_data = (Radio_List_Item_T *)data;
        item_data->smd->selected_sim_limits->cycle_start = item_data->radio_value;
        _update_genlist_start_date_item(item_data->smd);
 
        evas_object_del(item_data->popup);
-       SETTING_TRACE_END;
 }
 
 static void _create_list_popup(SmartMgrData *smd, char *title, Element_Type_E type)
 {
-       SETTING_TRACE_BEGIN;
-
        int i;
        Evas_Object *genlist = NULL;
        Elm_Gen_Item_Class *itc = NULL;
@@ -1262,14 +1150,10 @@ static void _create_list_popup(SmartMgrData *smd, char *title, Element_Type_E ty
        }
 
        elm_genlist_item_class_free(itc);
-
-       SETTING_TRACE_END;
 }
 
 static void _create_cycle_start_popup(SmartMgrData *smd)
 {
-       SETTING_TRACE_BEGIN;
-
        switch (smd->selected_sim_limits->cycle_mode) {
        case CYCLE_MODE_MONTHLY:
                _create_timer_popup(smd, "Select start date", smd->selected_sim_limits->cycle_start);
@@ -1285,13 +1169,10 @@ static void _create_cycle_start_popup(SmartMgrData *smd)
        default:
                break;
        }
-
-       SETTING_TRACE_END;
 }
 
 static int _create(void *data)
 {
-       SETTING_TRACE_BEGIN;
        SmartMgrData *smd = (SmartMgrData*)data;
        Evas_Object *back_btn = NULL;
        Elm_Object_Item *nf_it = NULL;
@@ -1309,18 +1190,15 @@ static int _create(void *data)
 
        sm_view_data_usage_mobile.is_create = 1;
 
-       SETTING_TRACE_END;
        return true;
 }
 
 
 static int _destroy(void *data)
 {
-       SETTING_TRACE_BEGIN;
        retv_if(NULL == data, SETTING_GENERAL_ERR_NULL_DATA_PARAMETER);
 
        sm_view_data_usage_mobile.is_create = 0;
-       SETTING_TRACE_END;
        return 0;
 }
 
@@ -1333,14 +1211,11 @@ static int _update(void* data)
 
        complement_data_usage_mobile_genlist(smd->mobile_data_setting_genlist, smd);
 
-       SETTING_TRACE_END;
        return 0;
 }
 
 static int _cleanup(void* data)
 {
-       SETTING_TRACE_BEGIN;
-       SETTING_TRACE_END;
        return _destroy(data);
 }
 
@@ -1359,45 +1234,33 @@ void init_mobile_settings_view(SmartMgrData *ad)
 
 static void _softkey_back_cb(void *data, Evas_Object *obj, void *event_info)
 {
-       SETTING_TRACE_BEGIN;
-
        SmartMgrData *smd = (SmartMgrData*)data;
        ret_if(!smd);
 
        elm_naviframe_item_pop(smd->md.naviframe);
-
-       SETTING_TRACE_END;
 }
 
 static Eina_Bool _pop_view_cb(void *data, Elm_Object_Item *it)
 {
-       SETTING_TRACE_BEGIN;
-
        SmartMgrData *smd = (SmartMgrData*)data;
        retv_if(!smd, FALSE);
 
-       smd->selected_sim_imsi = NULL;
+       smd->selected_sim_subscriber_id = NULL;
        smd->selected_sim_limits = NULL;
        smartmanager_stc_get_all_data();
 
        setting_view_change(smd->mobile_view, smd->main_view, smd);
 
-       SETTING_TRACE_END;
-
        return EINA_TRUE;
 }
 
 static char *_item_label_get(void *data, Evas_Object *obj, const char *part)
 {
-       SETTING_TRACE_BEGIN;
-
        Element *element = (Element*)data;
        retv_if(!element, NULL);
 
        SETTING_TRACE("%s -> %s", element->name, element->value);
 
-       SETTING_TRACE_END;
-
        if (!strcmp(part, "elm.text"))
                return strdup(element->value);
        else if (!strcmp(part, "elm.text.sub"))
@@ -1408,8 +1271,6 @@ static char *_item_label_get(void *data, Evas_Object *obj, const char *part)
 
 static void _item_selected_cb(void *data, Evas_Object *obj, void *event_info)
 {
-       SETTING_TRACE_BEGIN;
-
        Element *element = (Element*)data;
        Elm_Object_Item *item = (Elm_Object_Item *)event_info;
 
@@ -1430,8 +1291,6 @@ static void _item_selected_cb(void *data, Evas_Object *obj, void *event_info)
        default:
                SETTING_TRACE_ERROR("Unknown element type");
        }
-
-       SETTING_TRACE_END;
 }
 
 static char *_last_item_label_get(void *data, Evas_Object *obj,

diff --git a/setting-smartmanager/smartmanager-data/src/smartmanager-data.c b/setting-smartmanager/smartmanager-data/src/smartmanager-data.c
index 9c73cc26f91f39dc50fc6bd0e6195a70748e3843..2fa5bb3da9b5ace102a5b727ebbbd30f7f87596d 100755 (executable)
--- a/setting-smartmanager/smartmanager-data/src/smartmanager-data.c
+++ b/setting-smartmanager/smartmanager-data/src/smartmanager-data.c
@@ -213,22 +213,20 @@ static bool _create_app(void *data)
                                                TELEPHONY_NOTI_SIM_STATUS, _sim_state_change_cb, ad);
                SETTING_TRACE_DEBUG("telephony_set_noti_cb[0] %s",
                                                                get_error_message(ret));
-               if (get_imsi_from_telephony_handle(
-                                       ad->telephony_handles.handle[0],
-                                       ad->imsi_1, sizeof(ad->imsi_1))
+               if (get_subscriber_id_from_telephony_handle(
+                                       ad->telephony_handles.handle[0], &ad->subscriber_id_1)
                        )
-                       SETTING_TRACE_DEBUG("IMSI_1 %s", ad->imsi_1);
+                       SETTING_TRACE_DEBUG("SUBSCRIBER_ID_1 %s", ad->subscriber_id_1);
 
                if (ad->telephony_handles.count > 1) {
                        ret = telephony_set_noti_cb(ad->telephony_handles.handle[1],
                                                TELEPHONY_NOTI_SIM_STATUS, _sim_state_change_cb, ad);
                        SETTING_TRACE_DEBUG("telephony_set_noti_cb[1] %s",
                                                                        get_error_message(ret));
-                       if (get_imsi_from_telephony_handle(
-                                       ad->telephony_handles.handle[1],
-                                       ad->imsi_2, sizeof(ad->imsi_2))
+                       if (get_subscriber_id_from_telephony_handle(
+                                       ad->telephony_handles.handle[1], &ad->subscriber_id_2)
                                )
-                               SETTING_TRACE_DEBUG("IMSI_2 %s", ad->imsi_2);
+                               SETTING_TRACE_DEBUG("SUBSCRIBER_ID_2 %s", ad->subscriber_id_2);
                }
                _count_available_sim_cards(ad);
        }
@@ -287,6 +285,8 @@ static void _terminate_app(void *data)
        stc_deinitialize(&ad->stc);
        telephony_deinit(&ad->telephony_handles);
        _clear_all_stat_lists(ad);
+       free(ad->subscriber_id_1);
+       free(ad->subscriber_id_2);
 
        SETTING_TRACE_END;
 }
@@ -308,18 +308,22 @@ static void _sim_state_change_cb(telephony_h handle, telephony_noti_e noti_id,
 
        _count_available_sim_cards(ad);
 
-       if (get_imsi_from_telephony_handle(
+       free(ad->subscriber_id_1);
+       free(ad->subscriber_id_2);
+       ad->subscriber_id_1 = ad->subscriber_id_2 = NULL;
+
+       if (get_subscriber_id_from_telephony_handle(
                                ad->telephony_handles.handle[0],
-                               ad->imsi_1, sizeof(ad->imsi_1))
+                               &ad->subscriber_id_1)
                )
-               SETTING_TRACE_DEBUG("IMSI_1 %s", ad->imsi_1);
+               SETTING_TRACE_DEBUG("SUBSCRIBER_ID_1 %s", ad->subscriber_id_1);
 
        if (ad->num_sim_cards_available > 1)
-               if (get_imsi_from_telephony_handle(
+               if (get_subscriber_id_from_telephony_handle(
                                ad->telephony_handles.handle[1],
-                               ad->imsi_2, sizeof(ad->imsi_2))
+                               &ad->subscriber_id_2)
                        )
-                       SETTING_TRACE_DEBUG("IMSI_2 %s", ad->imsi_2);
+                       SETTING_TRACE_DEBUG("SUBSCRIBER_ID_2 %s", ad->subscriber_id_2);
 
        if (setting_view_node_get_cur_view() == ad->main_view) {
                SETTING_TRACE_DEBUG("_sim_state_change_cb: updating main view");
@@ -472,7 +476,7 @@ static stc_callback_ret_e _stc_stats_info_cb(stc_error_e result,
                                                                stc_stats_info_h info, void *user_data)
 {
        char *app_id = NULL;
-       char *imsi = NULL;
+       char *subscriber_id = NULL;
        int64_t incoming = 0;
        int64_t outgoing = 0;
        stc_iface_type_e iface = STC_IFACE_UNKNOWN;
@@ -517,17 +521,17 @@ static stc_callback_ret_e _stc_stats_info_cb(stc_error_e result,
                }
        }
        if (iface == STC_IFACE_DATACALL) {
-
-               ret = stc_stats_info_get_subscriber_id(info, &imsi);
+               ret = stc_stats_info_get_subscriber_id(info, &subscriber_id);
                if (STC_ERROR_NONE == ret) {
-
-                       SETTING_TRACE_DEBUG("Obtained IMSI: %s", imsi);
-                       if (compare_imsis(ad.imsi_1, imsi))
+                       SETTING_TRACE_DEBUG("Obtained subscriber ID: %s", subscriber_id);
+                       if (compare_subscriber_ids(ad.subscriber_id_1, subscriber_id))
                                if (_append_stats_list_item(&ad.sim_1_apps, app_id, incoming + outgoing)) {
+
                                        ad.main_view_update_type = MV_UPDATE_APPEND_SIM_1_APP;
                                        setting_view_update(ad.main_view, &ad);
                                }
-                       if (compare_imsis(ad.imsi_2, imsi))
+
+                       if (compare_subscriber_ids(ad.subscriber_id_2, subscriber_id))
                                if (_append_stats_list_item(&ad.sim_2_apps, app_id, incoming + outgoing)) {
                                        ad.main_view_update_type = MV_UPDATE_APPEND_SIM_2_APP;
                                        setting_view_update(ad.main_view, &ad);
@@ -536,7 +540,7 @@ static stc_callback_ret_e _stc_stats_info_cb(stc_error_e result,
                        SETTING_TRACE_ERROR("stc_stats_info_get_subscriber_id() error: %s",
                                                                                get_error_message(ret));
                }
-               free(imsi);
+               free(subscriber_id);
        }
 
        return STC_CALLBACK_CONTINUE;
@@ -547,7 +551,7 @@ static stc_callback_ret_e _total_stats_cb(stc_error_e result,
 {
        int64_t incoming = 0;
        int64_t outgoing = 0;
-       char *imsi = NULL;
+       char *subscriber_id = NULL;
        int ret = STC_ERROR_NONE;
        stc_iface_type_e iface_type = STC_IFACE_UNKNOWN;
 
@@ -568,16 +572,17 @@ static stc_callback_ret_e _total_stats_cb(stc_error_e result,
 
        if (STC_ERROR_NONE == ret) {
                if (iface_type == STC_IFACE_DATACALL) {
-                       ret = stc_stats_info_get_subscriber_id(info, &imsi);
+                       ret = stc_stats_info_get_subscriber_id(info, &subscriber_id);
                        if (STC_ERROR_NONE == ret) {
 
-                               SETTING_TRACE_DEBUG("Obtained IMSI: %s", imsi);
-                               if (compare_imsis(ad.imsi_1, imsi)) {
+                               SETTING_TRACE_DEBUG("Obtained SUBSCRIBER ID: %s",
+                                                                       subscriber_id);
+                               if (compare_subscriber_ids(ad.subscriber_id_1, subscriber_id)) {
                                        ad.main_view_update_type = MV_UPDATE_SIM_1_TOTAL_DATA_USAGE;
                                        ad.sim_1_limits.total_data_used = incoming + outgoing;
                                        SETTING_TRACE("SIM 1 total in: %lld out: %lld", incoming, outgoing);
                                }
-                               if (compare_imsis(ad.imsi_2, imsi)) {
+                               if (compare_subscriber_ids(ad.subscriber_id_2, subscriber_id)) {
                                        ad.main_view_update_type = MV_UPDATE_SIM_2_TOTAL_DATA_USAGE;
                                        ad.sim_2_limits.total_data_used = incoming + outgoing;
                                        SETTING_TRACE("SIM 2 total in: %lld out: %lld", incoming, outgoing);
@@ -586,7 +591,7 @@ static stc_callback_ret_e _total_stats_cb(stc_error_e result,
                                SETTING_TRACE_ERROR("stc_stats_info_get_subscriber_id() error: %s",
                                                                                        get_error_message(ret));
                        }
-                       free(imsi);
+                       free(subscriber_id);
                }
                if (iface_type == STC_IFACE_WIFI) {
                        ad.main_view_update_type = MV_UPDATE_WIFI_TOTAL_DATA_USAGE;
@@ -606,7 +611,7 @@ static stc_callback_ret_e _get_restrictions_cb(stc_error_e result,
 {
        int ret = STC_ERROR_NONE;
        char *app_id = NULL;
-       char *imsi = NULL;
+       char *subscriber_id = NULL;
        stc_iface_type_e iface_type = STC_IFACE_UNKNOWN;
        stc_restriction_status_e status = STC_RESTRICTION_UNKNOWN;
 
@@ -642,17 +647,18 @@ static stc_callback_ret_e _get_restrictions_cb(stc_error_e result,
        SETTING_TRACE_DEBUG("Obtained iface: %d", iface_type);
        if (iface_type == STC_IFACE_DATACALL) {
 
-               ret = stc_restriction_info_get_subscriber_id(info, &imsi);
+               ret = stc_restriction_info_get_subscriber_id(info, &subscriber_id);
+
                if (STC_ERROR_NONE == ret) {
-                       SETTING_TRACE_DEBUG("Obtained IMSI: %s", imsi);
-                       if (compare_imsis(ad.imsi_1, imsi)) {
+                       SETTING_TRACE_DEBUG("Obtained Subscriber ID: %s", subscriber_id);
+                       if (compare_subscriber_ids(ad.subscriber_id_1, subscriber_id)) {
                                (void)stc_restriction_info_get_limit(info,
                                                                                                        &(ad.sim_1_limits.limit));
                                (void)stc_restriction_info_get_warning_limit(info,
                                                                                                        &(ad.sim_1_limits.warning));
                                ad.main_view_update_type = MV_UPDATE_SIM_1_WARN_N_LIMIT;
                        }
-                       if (compare_imsis(ad.imsi_2, imsi)) {
+                       if (compare_subscriber_ids(ad.subscriber_id_2, subscriber_id)) {
                                (void)stc_restriction_info_get_limit(info,
                                                                                                        &(ad.sim_2_limits.limit));
                                (void)stc_restriction_info_get_warning_limit(info,
@@ -664,7 +670,7 @@ static stc_callback_ret_e _get_restrictions_cb(stc_error_e result,
                        SETTING_TRACE_ERROR("stc_stats_info_get_subscriber_id() error: %s",
                                                                                get_error_message(ret));
                }
-               free(imsi);
+               free(subscriber_id);
        }
 
        if (iface_type == STC_IFACE_WIFI) {

diff --git a/setting-smartmanager/smartmanager-data/src/smartmanager-utils.c b/setting-smartmanager/smartmanager-data/src/smartmanager-utils.c
index d630fbed02ab28109dbdc6313e31f2a9290d8f2e..48bb9c8f3e3f555ea56e9a236695d578f9f00617 100755 (executable)
--- a/setting-smartmanager/smartmanager-data/src/smartmanager-utils.c
+++ b/setting-smartmanager/smartmanager-data/src/smartmanager-utils.c
@@ -209,46 +209,30 @@ static bool _get_restrictions(stc_h stc, stc_iface_type_e iface_type,
        return true;
 }
 
-bool get_imsi_from_telephony_handle(telephony_h handle,
-                                                                       char out_buff[], int len_max)
+bool get_subscriber_id_from_telephony_handle(telephony_h handle,
+                                                                                       char **subscriber_id)
 {
-       char *mcc_mnc = NULL;
-       char *msin = NULL;
        int ret = TELEPHONY_ERROR_NONE;
 
-       if (!handle || len_max <= 0 || !out_buff)
-               return false;
-
-       ret = telephony_sim_get_operator(handle, &mcc_mnc);
-       if (TELEPHONY_ERROR_NONE != ret) {
-               SETTING_TRACE_ERROR("telephony_sim_get_operator(%p) %s",
-                                                       handle, get_error_message(ret));
-               return false;
-       }
-
-       ret = telephony_sim_get_msin(handle, &msin);
+       ret = telephony_sim_get_subscriber_id(handle, subscriber_id);
        if (TELEPHONY_ERROR_NONE != ret) {
                SETTING_TRACE_ERROR("telephony_sim_get_msin(%p) %s",
                                                        handle, get_error_message(ret));
-               free(mcc_mnc);
                return false;
        }
 
-       snprintf(out_buff, len_max, "%s%s", mcc_mnc, msin);
-
-       free(mcc_mnc);
-       free(msin);
        return true;
 }
 
-bool compare_imsis(const char *imsi_a, const char *imsi_b)
+bool compare_subscriber_ids(const char *id_a, const char *id_b)
 {
-       return (0 == safeStrNCmp(imsi_a, imsi_b, 15));
+       return (0 == safeStrNCmp(id_a, id_b, 128));
 }
 
 restrictions_result set_mobile_restriction_rule_parameters(
                                                                                        stc_restriction_rule_h rule,
-                                                                                       const char *imsi, int64_t limit,
+                                                                                       const char *subscriber_id,
+                                                                                       int64_t limit,
                                                                                        int64_t warning_limit)
 {
        SETTING_TRACE_BEGIN;
@@ -273,11 +257,12 @@ restrictions_result set_mobile_restriction_rule_parameters(
        if (limit > MAX_LIMIT_IN_BYTES)
                return RESTRICTIONS_VALUE_HIGHTER_THAN_MAX;
 
-       ret = stc_restriction_rule_set_subscriber_id(rule, imsi);
+       ret = stc_restriction_rule_set_subscriber_id(rule, subscriber_id);
        if (STC_ERROR_NONE != ret) {
-               (void)(void)stc_restriction_rule_destroy(rule);
-               SETTING_TRACE_ERROR("stc_restriction_rule_set_subscriber_id() error: %s",
-                                                                                       get_error_message(ret));
+               (void)stc_restriction_rule_destroy(rule);
+               SETTING_TRACE_ERROR("stc_restriction_rule_set_subscriber_id() error:"\
+                                                       "%s", get_error_message(ret));
+
                return RESTRICTIONS_OTHER_ERROR;
        }
 
@@ -306,7 +291,8 @@ restrictions_result set_mobile_restriction_rule_parameters(
        return RESTRICTIONS_OK;
 }
 
-restrictions_result set_mobile_limit_restrictions(stc_h stc_handle, const char *imsi, int64_t limit, int64_t warning_limit)
+restrictions_result set_mobile_limit_restrictions(stc_h stc_handle,
+               const char *subscriber_id, int64_t limit, int64_t warning_limit)
 {
        SETTING_TRACE_BEGIN;
        int ret = STC_ERROR_NONE;
@@ -320,7 +306,8 @@ restrictions_result set_mobile_limit_restrictions(stc_h stc_handle, const char *
                return RESTRICTIONS_OTHER_ERROR;
        }
 
-       result = set_mobile_restriction_rule_parameters(rule, imsi, limit, warning_limit);
+       result = set_mobile_restriction_rule_parameters(rule, subscriber_id, limit,
+                                                                                                       warning_limit);
        if (RESTRICTIONS_OK != result) {
                (void)stc_restriction_rule_destroy(rule);
                                SETTING_TRACE_ERROR("set_restriction_rule_parameters() error");