Sync from SPIN branch
[platform/core/telephony/tel-plugin-dbus_tapi.git] / src / dtapi_sat.c
similarity index 55%
rename from src/sat.c
rename to src/dtapi_sat.c
index e6f70fc..cfa1032 100644 (file)
--- a/src/sat.c
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include <errno.h>
+
+#include <glib.h>
 
 #include <tcore.h>
 #include <server.h>
 #include <plugin.h>
-#include <hal.h>
-#include <communicator.h>
-#include <core_object.h>
-#include <queue.h>
-#include <user_request.h>
-#include <util.h>
 #include <co_sat.h>
 
 #include "generated-code.h"
-#include "common.h"
-#include "sat_manager.h"
+#include "dtapi_common.h"
+#include "dtapi_sat_manager.h"
 #include "sat_ui_support/sat_ui_support.h"
 
-static void _sat_set_main_menu(struct custom_data *ctx, const char *cp_name, GVariant *main_menu)
+static void __sat_set_main_menu(struct custom_data *ctx,
+       const char *cp_name, GVariant *main_menu)
 {
        GSList *list = NULL;
        struct cached_data *object = NULL;
 
        for (list = ctx->cached_data; list; list = list->next) {
-               object = (struct cached_data *) list->data;
-               if (object == NULL)
-                       continue;
-
-               if (g_strcmp0(object->cp_name, cp_name) == 0) {
-                       /* need to free the previous main_menu */
+               object = (struct cached_data *)list->data;
+               if (object && g_strcmp0(object->cp_name, cp_name) == 0) {
+                       /*
+                        * Need to free the previous main_menu
+                        */
                        g_variant_unref(object->cached_sat_main_menu);
                        object->cached_sat_main_menu = main_menu;
+
                        return;
                }
        }
 
-       /* If 'object' is NOT created, then create the object and add to the list */
+       /*
+        * If 'object' is NOT created,
+        * then create the object and add to the list
+        */
        object = g_try_malloc0(sizeof(struct cached_data));
        if (NULL == object) {
-               err(" Malloc Failed");
+               err("Memory allocation failed");
                return;
        }
+
        object->cp_name = g_strdup(cp_name);
        object->cached_sat_main_menu = main_menu;
 
-       ctx->cached_data = g_slist_append(ctx->cached_data, (gpointer) object);
+       /*
+        * Append the new 'object' to cached data list
+        */
+       ctx->cached_data = g_slist_append(ctx->cached_data, (gpointer)object);
 }
 
-static GVariant *_sat_get_main_menu(struct custom_data *ctx, const char *cp_name)
+static GVariant *__sat_get_main_menu(struct custom_data *ctx,
+       const char *cp_name)
 {
        GSList *list = NULL;
        struct cached_data *object;
@@ -81,18 +85,15 @@ static GVariant *_sat_get_main_menu(struct custom_data *ctx, const char *cp_name
         */
        for (list = ctx->cached_data; list; list = list->next) {
                object = (struct cached_data *)list->data;
-               if (object == NULL)
-                       continue;
-
-               if (g_strcmp0(object->cp_name, cp_name) == 0)
+               if (object && g_strcmp0(object->cp_name, cp_name) == 0)
                        return object->cached_sat_main_menu;
        }
 
        return NULL;
 }
 
-static gboolean on_sat_get_main_menu_info(TelephonySAT *sat, GDBusMethodInvocation *invocation,
-               gpointer user_data)
+static gboolean on_sat_get_main_menu_info(TelephonySAT *sat,
+       GDBusMethodInvocation *invocation, gpointer user_data)
 {
        struct custom_data *ctx = user_data;
        GVariant *main_menu = NULL;
@@ -110,41 +111,44 @@ static gboolean on_sat_get_main_menu_info(TelephonySAT *sat, GDBusMethodInvocati
        if (!check_access_control(p_cynara, invocation, AC_SAT, "r"))
                return TRUE;
 
-       main_menu = _sat_get_main_menu(ctx, GET_CP_NAME(invocation));
+       main_menu = __sat_get_main_menu(ctx, GET_CP_NAME(invocation));
        if (!main_menu) {
-               dbg("no main menu");
-               return FALSE;
+               err("NO Main Menu");
+               return TRUE;
        }
 
-
-
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-       g_variant_get(main_menu, "(ibs@vibb@v@v)", &command_id, &b_present, &title, &items, &item_cnt,
-                       &b_help_info, &b_updated, &icon_id, &icon_list);
+       g_variant_get(main_menu, "(ibs@vibb@v@v)", &command_id,
+               &b_present, &title, &items, &item_cnt,
+               &b_help_info, &b_updated, &icon_id, &icon_list);
 
-       telephony_sat_complete_get_main_menu_info(sat, invocation, result, command_id, b_present, title,
-                       items, item_cnt, b_help_info, b_updated, icon_id, icon_list);
+       telephony_sat_complete_get_main_menu_info(sat, invocation,
+               result, command_id, b_present, title,
+               items, item_cnt, b_help_info, b_updated, icon_id, icon_list);
 #else
-       g_variant_get(main_menu, "(ibs@vibb)", &command_id, &b_present, &title, &items, &item_cnt,
-                       &b_help_info, &b_updated);
+       g_variant_get(main_menu, "(ibs@vibb)", &command_id,
+               &b_present, &title, &items, &item_cnt,
+               &b_help_info, &b_updated);
 
-       telephony_sat_complete_get_main_menu_info(sat, invocation, result, command_id, b_present, title,
-                       items, item_cnt, b_help_info, b_updated);
+       telephony_sat_complete_get_main_menu_info(sat, invocation,
+               result, command_id, b_present, title,
+               items, item_cnt, b_help_info, b_updated);
 #endif
+
        g_free(title);
 
        return TRUE;
 }
 
-static gboolean on_sat_send_display_status(TelephonySAT *sat, GDBusMethodInvocation *invocation,
-               gint arg_command_id, gboolean arg_display_status,
-               gpointer user_data)
+static gboolean on_sat_send_display_status(TelephonySAT *sat,
+       GDBusMethodInvocation *invocation,
+       gint command_id, gboolean display_status, gpointer user_data)
 {
        TcorePlugin *plg = NULL;
        char *cp_name;
        struct custom_data *ctx = user_data;
        gboolean result = FALSE;
-       gint out_param = 1;
+       gint out_param = 0;
        cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
        if (!check_access_control(p_cynara, invocation, AC_SAT, "x"))
@@ -153,24 +157,30 @@ static gboolean on_sat_send_display_status(TelephonySAT *sat, GDBusMethodInvocat
        cp_name = GET_CP_NAME(invocation);
        plg = tcore_server_find_plugin(ctx->server, cp_name);
        if (!plg) {
-               dbg("there is no valid plugin at this point");
-               out_param = 0;
-               telephony_sat_complete_send_ui_display_status(sat, invocation, out_param);
+               dbg("There is NO valid plugin at this point");
+
+               telephony_sat_complete_send_ui_display_status(sat,
+                       invocation, out_param);
+
                return TRUE;
        }
 
-       result = sat_manager_handle_ui_display_status(ctx, plg, arg_command_id, arg_display_status);
+       result = sat_manager_handle_ui_display_status(ctx, plg,
+               command_id, display_status);
        if (!result)
-               dbg("fail to send exec result");
+               dbg("Failed to send 'exec' result");
 
        out_param = (result ? 1 : 0);
-       telephony_sat_complete_send_ui_display_status(sat, invocation, out_param);
+       telephony_sat_complete_send_ui_display_status(sat,
+               invocation, out_param);
+
        return TRUE;
 }
 
-static gboolean on_sat_send_user_confirm(TelephonySAT *sat, GDBusMethodInvocation *invocation,
-               gint arg_command_id, gint arg_command_type, gint arg_user_confirm_type,
-               GVariant *arg_additional_data, gpointer user_data)
+static gboolean on_sat_send_user_confirm(TelephonySAT *sat,
+       GDBusMethodInvocation *invocation,
+       gint command_id, gint command_type, gint user_confirm_type,
+       GVariant *additional_data, gpointer user_data)
 {
        TcorePlugin *plg = NULL;
        char *cp_name;
@@ -178,7 +188,7 @@ static gboolean on_sat_send_user_confirm(TelephonySAT *sat, GDBusMethodInvocatio
        cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
        gboolean result = FALSE;
-       gint out_param = 1;
+       gint out_param = 0;
        GVariant *confirm_data = NULL;
 
        if (!check_access_control(p_cynara, invocation, AC_SAT, "x"))
@@ -187,27 +197,33 @@ static gboolean on_sat_send_user_confirm(TelephonySAT *sat, GDBusMethodInvocatio
        cp_name = GET_CP_NAME(invocation);
        plg = tcore_server_find_plugin(ctx->server, cp_name);
        if (!plg) {
-               dbg("there is no valid plugin at this point");
-               out_param = 0;
-               telephony_sat_complete_send_user_confirm(sat, invocation, out_param);
+               dbg("There is NO valid plugin at this point");
+
+               telephony_sat_complete_send_user_confirm(sat,
+                       invocation, out_param);
+
                return TRUE;
        }
 
-       confirm_data = g_variant_new("(iiv)", arg_command_id, arg_user_confirm_type, arg_additional_data);
+       confirm_data = g_variant_new("(iiv)", command_id,
+               user_confirm_type, additional_data);
 
-       result = sat_manager_handle_user_confirm(ctx, plg, confirm_data);
+       result = sat_manager_handle_user_confirm(ctx,
+               plg, confirm_data);
        if (!result)
-               dbg("fail to send user confirm");
+               dbg("Failed to send 'user confirm'");
 
        out_param = (result ? 1 : 0);
-       telephony_sat_complete_send_user_confirm(sat, invocation, out_param);
+       telephony_sat_complete_send_user_confirm(sat,
+               invocation, out_param);
 
        return TRUE;
 }
 
-static gboolean on_sat_send_app_exec_result(TelephonySAT *sat, GDBusMethodInvocation *invocation,
-               gint arg_command_id, gint arg_command_type, GVariant *arg_exec_result,
-               gpointer user_data)
+static gboolean on_sat_send_app_exec_result(TelephonySAT *sat,
+       GDBusMethodInvocation *invocation,
+       gint command_id, gint command_type,
+       GVariant *exec_result, gpointer user_data)
 {
        TcorePlugin *plg = NULL;
        char *cp_name;
@@ -215,7 +231,7 @@ static gboolean on_sat_send_app_exec_result(TelephonySAT *sat, GDBusMethodInvoca
        cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
        gboolean result = FALSE;
-       gint out_param = 1;
+       gint out_param = 0;
 
        if (!check_access_control(p_cynara, invocation, AC_SAT, "x"))
                return TRUE;
@@ -223,96 +239,95 @@ static gboolean on_sat_send_app_exec_result(TelephonySAT *sat, GDBusMethodInvoca
        cp_name = GET_CP_NAME(invocation);
        plg = tcore_server_find_plugin(ctx->server, cp_name);
        if (!plg) {
-               dbg("there is no valid plugin at this point");
-               out_param = 0;
-               telephony_sat_complete_send_app_exec_result(sat, invocation, out_param);
+               dbg("There is NO valid plugin at this point");
+
+               telephony_sat_complete_send_app_exec_result(sat,
+                       invocation, out_param);
+
                return TRUE;
        }
 
-       dbg("processing app exec result");
-       result = sat_manager_handle_app_exec_result(ctx, plg, arg_command_id, arg_command_type, arg_exec_result);
+       dbg("Processing app 'exec' result");
+       result = sat_manager_handle_app_exec_result(ctx, plg,
+               command_id, command_type, exec_result);
        if (!result)
-               dbg("fail to send exec result");
+               dbg("Failed to send 'exec' result");
 
        out_param = (result ? 1 : 0);
-       telephony_sat_complete_send_app_exec_result(sat, invocation, out_param);
+       telephony_sat_complete_send_app_exec_result(sat,
+               invocation, out_param);
+
        return TRUE;
 }
 
-static gboolean on_sat_select_menu(TelephonySAT *sat, GDBusMethodInvocation *invocation,
-               guchar arg_item_identifier, gboolean arg_help_request,
-               gpointer user_data)
+static gboolean on_sat_select_menu(TelephonySAT *sat,
+       GDBusMethodInvocation *invocation,
+       guchar item_identifier, gboolean help_request, gpointer user_data)
 {
-       TReturn rv;
        struct custom_data *ctx = user_data;
-       UserRequest *ur = NULL;
-       struct treq_sat_envelop_cmd_data envelop_data;
+       struct treq_sat_envelop_cmd_data req;
        cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
        if (!check_access_control(p_cynara, invocation, AC_SAT, "x"))
                return TRUE;
 
-       ur = MAKE_UR(ctx, sat, invocation);
-       memset(&envelop_data, 0, sizeof(struct treq_sat_envelop_cmd_data));
-       envelop_data.sub_cmd = ENVELOP_MENU_SELECTION;
-       envelop_data.envelop_data.menu_select.device_identitie.src = DEVICE_ID_KEYPAD;
-       envelop_data.envelop_data.menu_select.device_identitie.dest = DEVICE_ID_SIM;
-       envelop_data.envelop_data.menu_select.item_identifier.item_identifier = arg_item_identifier;
-       envelop_data.envelop_data.menu_select.help_request = arg_help_request;
-
-       tcore_user_request_set_data(ur, sizeof(struct treq_sat_envelop_cmd_data), &envelop_data);
-       tcore_user_request_set_command(ur, TREQ_SAT_REQ_ENVELOPE);
-       rv = tcore_communicator_dispatch_request(ctx->comm, ur);
-       if (rv != TCORE_RETURN_SUCCESS) {
-               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
-               dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", rv);
-               tcore_user_request_unref(ur);
-       }
+       memset(&req, 0x0, sizeof(struct treq_sat_envelop_cmd_data));
+
+       req.sub_cmd = ENVELOP_MENU_SELECTION;
+       req.envelop_data.menu_select.device_identitie.src = DEVICE_ID_KEYPAD;
+       req.envelop_data.menu_select.device_identitie.dest = DEVICE_ID_SIM;
+       req.envelop_data.menu_select.item_identifier.item_identifier = item_identifier;
+       req.envelop_data.menu_select.help_request = help_request;
+
+       /* Dispatch request */
+       dtapi_dispatch_request(ctx, sat, invocation,
+               TREQ_SAT_REQ_ENVELOPE,
+               &req, sizeof(struct treq_sat_envelop_cmd_data));
 
        return TRUE;
 }
 
-static gboolean on_sat_download_event(TelephonySAT *sat, GDBusMethodInvocation *invocation,
-               gint arg_event_download_type, gint arg_src_device, gint arg_dest_device,
-               GVariant *arg_download_data, gpointer user_data)
+static gboolean on_sat_download_event(TelephonySAT *sat,
+       GDBusMethodInvocation *invocation,
+       gint event_download_type, gint src_device, gint dest_device,
+       GVariant *download_data, gpointer user_data)
 {
        gboolean b_event = FALSE;
-       TReturn rv;
        struct custom_data *ctx = user_data;
-       UserRequest *ur = NULL;
-       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
-       struct treq_sat_envelop_cmd_data envelop_data;
+       struct treq_sat_envelop_cmd_data req;
+       cynara *p_cynara = (ctx) ? ctx->p_cynara : NULL;
 
        if (!check_access_control(p_cynara, invocation, AC_SAT, "x"))
                return TRUE;
 
-       ur = MAKE_UR(ctx, sat, invocation);
-       memset(&envelop_data, 0, sizeof(struct treq_sat_envelop_cmd_data));
-       envelop_data.sub_cmd = ENVELOP_EVENT_DOWNLOAD;
-       envelop_data.envelop_data.event_download.event = arg_event_download_type;
-       b_event = sat_manager_handle_event_download_envelop(arg_event_download_type, arg_src_device, arg_dest_device,
-                               &envelop_data.envelop_data.event_download, arg_download_data);
+       memset(&req, 0x0, sizeof(struct treq_sat_envelop_cmd_data));
+
+       req.sub_cmd = ENVELOP_EVENT_DOWNLOAD;
+       req.envelop_data.event_download.event = event_download_type;
 
+       b_event = sat_manager_handle_event_download_envelop(event_download_type,
+               src_device, dest_device,
+               &req.envelop_data.event_download, download_data);
        if (!b_event) {
-               telephony_sat_complete_download_event(sat, invocation, -1, ENVELOPE_FAILED);
-               tcore_user_request_unref(ur);
+               err("Envelop failed");
+
+               telephony_sat_complete_download_event(sat,
+                       invocation, -1, ENVELOPE_FAILED);
+
                return TRUE;
        }
 
-       tcore_user_request_set_data(ur, sizeof(struct treq_sat_envelop_cmd_data), &envelop_data);
-       tcore_user_request_set_command(ur, TREQ_SAT_REQ_ENVELOPE);
-       rv = tcore_communicator_dispatch_request(ctx->comm, ur);
-       if (rv != TCORE_RETURN_SUCCESS) {
-               FAIL_RESPONSE(invocation, DEFAULT_MSG_REQ_FAILED);
-               dbg("[ error ] tcore_communicator_dispatch_request() : (0x%x)", rv);
-               tcore_user_request_unref(ur);
-       }
+       /* Dispatch request */
+       dtapi_dispatch_request(ctx, sat, invocation,
+               TREQ_SAT_REQ_ENVELOPE,
+               &req, sizeof(struct treq_sat_envelop_cmd_data));
 
        return TRUE;
 }
 
-gboolean dbus_plugin_setup_sat_interface(TelephonyObjectSkeleton *object, struct custom_data *ctx)
+gboolean dbus_plugin_setup_sat_interface(TelephonyObjectSkeleton *object,
+       struct custom_data *ctx)
 {
        TelephonySAT *sat;
 
@@ -322,6 +337,9 @@ gboolean dbus_plugin_setup_sat_interface(TelephonyObjectSkeleton *object, struct
 
        dbg("sat = %p", sat);
 
+       /*
+        * Register signal handlers for SAT interface
+        */
        g_signal_connect(sat,
                "handle-get-main-menu-info",
                G_CALLBACK(on_sat_get_main_menu_info), ctx);
@@ -349,9 +367,9 @@ gboolean dbus_plugin_setup_sat_interface(TelephonyObjectSkeleton *object, struct
        return TRUE;
 }
 
-gboolean dbus_plugin_sat_response(struct custom_data *ctx, UserRequest *ur,
-               struct dbus_request_info *dbus_info, enum tcore_response_command command,
-               unsigned int data_len, const void *data)
+gboolean dbus_plugin_sat_response(struct custom_data *ctx,
+       UserRequest *ur, struct dbus_request_info *dbus_info,
+       enum tcore_response_command command, unsigned int data_len, const void *data)
 {
        const struct tresp_sat_envelop_data *envelop_rsp = NULL;
 
@@ -359,43 +377,54 @@ gboolean dbus_plugin_sat_response(struct custom_data *ctx, UserRequest *ur,
        case TRESP_SAT_REQ_ENVELOPE: {
                envelop_rsp = (struct tresp_sat_envelop_data *)data;
 
-               dbg("envelop sub_cmd(%d) result(%d) rsp(%d)", envelop_rsp->sub_cmd, envelop_rsp->result, envelop_rsp->envelop_resp);
-
-               if (envelop_rsp->sub_cmd == ENVELOP_MENU_SELECTION) {
-                       telephony_sat_complete_select_menu(dbus_info->interface_object, dbus_info->invocation,
-                                       envelop_rsp->result, envelop_rsp->envelop_resp);
-               } else if (envelop_rsp->sub_cmd == ENVELOP_EVENT_DOWNLOAD) {
-                       telephony_sat_complete_download_event(dbus_info->interface_object, dbus_info->invocation,
-                                       envelop_rsp->result, envelop_rsp->envelop_resp);
-               }
-       } break;
+               dbg("SAT_REQ_ENVELOPE - Result: [%d] Envelop sub-cmd: [%d] Envelop response: [%d]",
+                       envelop_rsp->result,
+                       (envelop_rsp->sub_cmd == ENVELOP_MENU_SELECTION ? "MENU SELECTION" :
+                       (envelop_rsp->sub_cmd == ENVELOP_EVENT_DOWNLOAD ? "EVENT DOWNLOAD" :
+                       "UNKNOWN")),
+                       (envelop_rsp->envelop_resp == ENVELOPE_SUCCESS ? "Success" :
+                       (envelop_rsp->envelop_resp == ENVELOPE_SIM_BUSY? "SIM Busy" :
+                       "Fail")));
+
+               if (envelop_rsp->sub_cmd == ENVELOP_MENU_SELECTION)
+                       telephony_sat_complete_select_menu(dbus_info->interface_object,
+                               dbus_info->invocation, envelop_rsp->result,
+                               envelop_rsp->envelop_resp);
+               else if (envelop_rsp->sub_cmd == ENVELOP_EVENT_DOWNLOAD)
+                       telephony_sat_complete_download_event(dbus_info->interface_object,
+                               dbus_info->invocation, envelop_rsp->result,
+                               envelop_rsp->envelop_resp);
+       }
+       break;
 
        case TRESP_SAT_REQ_TERMINALRESPONSE:
-               dbg("receive TRESP_SAT_REQ_TERMINALRESPONSE");
+               dbg("SAT_REQ_TERMINALRESPONSE");
        break;
 
        default:
-               dbg("not handled command[%d]", command);
+               err("Unhandled/Unknown Response: [0x%x]", command);
        break;
        }
+
        return TRUE;
 }
 
-gboolean dbus_plugin_sat_notification(struct custom_data *ctx, CoreObject *source,
-               TelephonyObjectSkeleton *object, enum tcore_notification_command command,
-               unsigned int data_len, const void *data)
+gboolean dbus_plugin_sat_notification(struct custom_data *ctx,
+       CoreObject *source, TelephonyObjectSkeleton *object,
+       enum tcore_notification_command command, unsigned int data_len, const void *data)
 {
        TelephonySAT *sat;
        const char *cp_name;
        enum dbus_tapi_sim_slot_id slot_id;
 
        if (!object || !ctx) {
-               dbg("NULL data is detected!!");
+               err("NULL data is detected!!");
                return FALSE;
        }
+
        cp_name  = tcore_server_get_cp_name_by_plugin(tcore_object_ref_plugin(source));
-       slot_id = get_sim_slot_id_by_cp_name((char *)cp_name);
-       dbg("slot_id: [%d]", slot_id);
+       slot_id = get_sim_slot_id_by_cp_name(cp_name);
+       dbg("Slot ID: [%d]", slot_id);
 
        sat = telephony_object_peek_sat(TELEPHONY_OBJECT(object));
        if (sat == NULL) {
@@ -403,29 +432,34 @@ gboolean dbus_plugin_sat_notification(struct custom_data *ctx, CoreObject *sourc
                return FALSE;
        }
 
-       /* session end notification */
        switch (command) {
-       case TNOTI_SAT_SESSION_END: {
-               dbg("notified sat session end evt");
+       case TNOTI_SAT_SESSION_END: { /* Session End notification */
+               dbg("[%s] SAT_SESSION_END", cp_name);
+
                sat_manager_init_queue(ctx, cp_name);
 
                /* sat_ui_support_terminate_sat_ui(); */
-               telephony_sat_emit_end_proactive_session(sat, SAT_PROATV_CMD_TYPE_END_PROACTIVE_SESSION);
-               return TRUE;
-               } break;
+               telephony_sat_emit_end_proactive_session(sat,
+                       SAT_PROATV_CMD_TYPE_END_PROACTIVE_SESSION);
+       }
+       break;
 
-       /* call control notification */
-       case TNOTI_SAT_CALL_CTRL_RESULT: {
+       case TNOTI_SAT_CALL_CTRL_RESULT: { /* Call Control notification */
                struct tnoti_sat_call_control_result_ind *cc_result_noti = NULL;
                gint call_ctrl_result = 0, bc_repeat_indicator = 0, ton = 0x0F, npi = 0X0F;
-               gchar *text = NULL, *call_num = NULL, *ss_string = NULL, *sub_addr = NULL, *ccp1 = NULL, *ccp2 = NULL;
+               gchar *text = NULL, *call_num = NULL, *ss_string = NULL, *sub_addr = NULL;
+               gchar *ccp1 = NULL, *ccp2 = NULL;
 
                cc_result_noti = (struct tnoti_sat_call_control_result_ind *)data;
                if (cc_result_noti == NULL) {
                        err("Indication data is NULL");
                        return FALSE;
                }
-               dbg("sat call control result notification");
+
+               dbg("[%s] SAT_CALL_CTRL_RESULT - Result: [%s]", cp_name,
+                       (cc_result_noti->cc_result == call_control_allowed_no_mod ? "No Modification" :
+                       (cc_result_noti->cc_result == call_control_allowed_with_mod ? "Allowed Modification" :
+                       "NOT Allowed")));
 
                call_ctrl_result = cc_result_noti->cc_result;
                bc_repeat_indicator = cc_result_noti->bc_repeat_type.bc_indi_repeat_type;
@@ -460,18 +494,23 @@ gboolean dbus_plugin_sat_notification(struct custom_data *ctx, CoreObject *sourc
                else
                        ccp1 = g_strdup("");
 
-
                if (cc_result_noti->ccp2.data_len > 0)
                        ccp2 = g_strdup(cc_result_noti->ccp2.data);
                else
                        ccp2 = g_strdup("");
 
-               telephony_sat_emit_call_control_result(sat, call_ctrl_result, text, ton, npi, call_num,
+               telephony_sat_emit_call_control_result(sat,
+                       call_ctrl_result, text, ton, npi, call_num,
                        ss_string, sub_addr, ccp1, ccp2, bc_repeat_indicator);
 
-               g_free(text); g_free(call_num); g_free(ss_string); g_free(sub_addr); g_free(ccp1); g_free(ccp2);
-               return TRUE;
-               } break;
+               g_free(text);
+               g_free(call_num);
+               g_free(ss_string);
+               g_free(sub_addr);
+               g_free(ccp1);
+               g_free(ccp2);
+       }
+       break;
 
        case TNOTI_SAT_MO_SM_CTRL_RESULT: {
                struct tnoti_sat_mo_sm_control_result_ind *mo_sm_result_noti = NULL;
@@ -484,7 +523,11 @@ gboolean dbus_plugin_sat_notification(struct custom_data *ctx, CoreObject *sourc
                        err("Indication data is NULL");
                        return FALSE;
                }
-               dbg("sat mo sm control result notification");
+
+               dbg("[%s] SAT_MO_SM_CTRL_RESULT - Result: [%s]", cp_name,
+                       (mo_sm_result_noti->cc_result == call_control_allowed_no_mod ? "No Modification" :
+                       (mo_sm_result_noti->cc_result == call_control_allowed_with_mod ? "Allowed Modification" :
+                       "NOT Allowed")));
 
                call_ctrl_result = mo_sm_result_noti->cc_result;
 
@@ -515,34 +558,38 @@ gboolean dbus_plugin_sat_notification(struct custom_data *ctx, CoreObject *sourc
                else
                        text = g_strdup("");
 
-               telephony_sat_emit_mo_sm_control_result(sat, call_ctrl_result, text,
+               telephony_sat_emit_mo_sm_control_result(sat,
+                       call_ctrl_result, text,
                        rp_dst_ton, rp_dst_npi, rp_dst_call_num, tp_dst_ton, tp_dst_npi, tp_dst_call_num);
 
-               g_free(text); g_free(rp_dst_call_num); g_free(tp_dst_call_num);
-               return TRUE;
-               } break;
+               g_free(text);
+               g_free(rp_dst_call_num);
+               g_free(tp_dst_call_num);
+       }
+       break;
 
-       /* Proactive Command Notification */
-       case TNOTI_SAT_PROACTIVE_CMD: {
+       case TNOTI_SAT_PROACTIVE_CMD: { /* Proactive Command Notification */
                struct tnoti_sat_proactive_ind *p_ind;
                TcorePlugin *plg;
+
                plg = tcore_object_ref_plugin(source);
                if (plg == NULL) {
-                       dbg("there is no valid plugin at this point");
+                       err("there is no valid plugin at this point");
                        return FALSE;
                }
 
                if (cp_name == NULL) {
-                       dbg("CP name is NULL");
+                       err("CP name is NULL");
                        return FALSE;
                }
 
                p_ind = (struct tnoti_sat_proactive_ind *)data;
                if (p_ind == NULL) {
-                       dbg("Indication data is NULL");
+                       err("Indication data is NULL");
                        return FALSE;
                }
-               dbg("notified sat proactive command(%d)", p_ind->cmd_type);
+
+               dbg("[%s] SAT_PROACTIVE_CMD - [0x%02x]", cp_name, p_ind->cmd_type);
 
                switch (p_ind->cmd_type) {
                case SAT_PROATV_CMD_SETUP_MENU: {
@@ -558,7 +605,9 @@ gboolean dbus_plugin_sat_notification(struct custom_data *ctx, CoreObject *sourc
                        menu_info = sat_manager_caching_setup_menu_info(ctx, cp_name,
                                (struct tel_sat_setup_menu_tlv*)&p_ind->proactive_ind_data.setup_menu);
 
-                       dbg("menu_info type_format(%s)", g_variant_get_type_string(menu_info));
+                       dbg("PROATV_CMD_SETUP_MENU - type_format: [%s]",
+                               g_variant_get_type_string(menu_info));
+
 #if defined(TIZEN_SUPPORT_SAT_ICON)
                        g_variant_get(menu_info, "(ibs@vibb@v@v)", &command_id, &b_present, &title, &items,
                                &menu_cnt, &b_helpinfo, &b_updated, &icon_id, &icon_list);
@@ -567,13 +616,18 @@ gboolean dbus_plugin_sat_notification(struct custom_data *ctx, CoreObject *sourc
                                &menu_cnt, &b_helpinfo, &b_updated);
 #endif
                        if (!menu_cnt) {
-                               dbg("no main menu data");
-                               /* No need to cache anything so make store NULL in cached_sat_main_menu */
-                               _sat_set_main_menu(ctx, cp_name, NULL);
+                               dbg("NO Main Menu data");
+
+                               /*
+                                * No need to cache anything so make store NULL
+                                * in cached_sat_main_menu
+                                */
+                               __sat_set_main_menu(ctx, cp_name, NULL);
                                g_variant_unref(menu_info);
                        } else {
-                               _sat_set_main_menu(ctx, cp_name, menu_info);
+                               __sat_set_main_menu(ctx, cp_name, menu_info);
                        }
+
                        if (b_updated) {
 #if defined(TIZEN_SUPPORT_SAT_ICON)
                                telephony_sat_emit_setup_menu(sat, command_id, b_present, title, items, menu_cnt,
@@ -583,8 +637,10 @@ gboolean dbus_plugin_sat_notification(struct custom_data *ctx, CoreObject *sourc
                                        b_helpinfo, b_updated);
 #endif
                        }
+
                        g_free(title);
-                       } break;
+               }
+               break;
 
                case SAT_PROATV_CMD_DISPLAY_TEXT: {
                        GVariant *display_text = NULL;
@@ -597,14 +653,17 @@ gboolean dbus_plugin_sat_notification(struct custom_data *ctx, CoreObject *sourc
 #endif
                        int ret;
 
-                       display_text = sat_manager_display_text_noti(ctx, cp_name, (struct tel_sat_display_text_tlv*) &p_ind->proactive_ind_data.display_text, p_ind->decode_err_code);
-
+                       display_text = sat_manager_display_text_noti(ctx, cp_name,
+                               (struct tel_sat_display_text_tlv *)&p_ind->proactive_ind_data.display_text,
+                               p_ind->decode_err_code);
                        if (!display_text) {
-                               dbg("no display text data");
+                               dbg("NO Display text data");
                                return TRUE;
                        }
 
-                       dbg("display text type_format(%s)", g_variant_get_type_string(display_text));
+                       dbg("PROATV_CMD_DISPLAY_TEXT - type_format: [%s]",
+                               g_variant_get_type_string(display_text));
+
 #if defined(TIZEN_SUPPORT_SAT_ICON)
                        g_variant_get(display_text, "(isiibbb@v)", &command_id, &text, &text_len, &duration,
                                &high_priority, &user_rsp_required, &immediately_rsp, &icon_id);
@@ -612,15 +671,20 @@ gboolean dbus_plugin_sat_notification(struct custom_data *ctx, CoreObject *sourc
                        g_variant_get(display_text, "(isiibbb)", &command_id, &text, &text_len, &duration,
                                &high_priority, &user_rsp_required, &immediately_rsp);
 #endif
-                       ret = sat_ui_support_launch_sat_ui(SAT_PROATV_CMD_DISPLAY_TEXT, display_text, slot_id);
+
+                       ret = sat_ui_support_launch_sat_ui(SAT_PROATV_CMD_DISPLAY_TEXT,
+                               display_text, slot_id);
                        if (!ret) {
                                int rv;
-                               dbg("fail to launch sat-ui, remove the queued data!!\n");
+
+                               err("Failed to launch 'sat-ui', remove the queued data!!!");
+
                                if (!sat_manager_handle_sat_ui_launch_fail(ctx, cp_name, p_ind))
-                                       dbg("Fail to send terminal response\n");
+                                       dbg("Failed to send Terminal Response!!!");
+
                                rv = sat_manager_remove_cmd_by_id(ctx, command_id);
                                if (!rv)
-                                       dbg("fail to dequeue data\n");
+                                       dbg("Failed to de-queue data\n");
                        }
 
 #if defined(TIZEN_SUPPORT_SAT_ICON)
@@ -630,8 +694,10 @@ gboolean dbus_plugin_sat_notification(struct custom_data *ctx, CoreObject *sourc
                        telephony_sat_emit_display_text(sat, command_id, text, text_len, duration,
                                high_priority, user_rsp_required, immediately_rsp);
 #endif
+
                        g_free(text);
-                       } break;
+               }
+               break;
 
                case SAT_PROATV_CMD_SELECT_ITEM: {
                        GVariant *select_menu = NULL;
@@ -644,14 +710,16 @@ gboolean dbus_plugin_sat_notification(struct custom_data *ctx, CoreObject *sourc
 #endif
                        int ret;
 
-                       select_menu = sat_manager_select_item_noti(ctx, cp_name, (struct tel_sat_select_item_tlv*) &p_ind->proactive_ind_data.select_item);
-
+                       select_menu = sat_manager_select_item_noti(ctx, cp_name,
+                               (struct tel_sat_select_item_tlv *)&p_ind->proactive_ind_data.select_item);
                        if (!select_menu) {
-                               dbg("no select menu data");
+                               dbg("NO Select menu data");
                                return TRUE;
                        }
 
-                       dbg("select menu type_format(%s)", g_variant_get_type_string(select_menu));
+                       dbg("PROATV_CMD_SELECT_ITEM - type_format: [%s]",
+                               g_variant_get_type_string(select_menu));
+
 #if defined(TIZEN_SUPPORT_SAT_ICON)
                        g_variant_get(select_menu, "(ibsiii@v@v@v)", &command_id, &help_info, &selected_text,
                                &text_len, &default_item_id, &menu_cnt, &menu_items, &icon_id, &icon_list);
@@ -659,15 +727,19 @@ gboolean dbus_plugin_sat_notification(struct custom_data *ctx, CoreObject *sourc
                        g_variant_get(select_menu, "(ibsiii@v)", &command_id, &help_info, &selected_text,
                                &text_len, &default_item_id, &menu_cnt, &menu_items);
 #endif
-                       ret = sat_ui_support_launch_sat_ui(SAT_PROATV_CMD_SELECT_ITEM, select_menu, slot_id);
+                       ret = sat_ui_support_launch_sat_ui(SAT_PROATV_CMD_SELECT_ITEM,
+                               select_menu, slot_id);
                        if (!ret) {
                                int rv;
-                               dbg("fail to launch sat-ui, remove the queued data!!\n");
+
+                               err("Failed to launch 'sat-ui', remove the queued data!!!");
+
                                if (!sat_manager_handle_sat_ui_launch_fail(ctx, cp_name, p_ind))
-                                       dbg("Fail to send terminal response\n");
+                                       dbg("Failed to send Terminal Response!!!");
+
                                rv = sat_manager_remove_cmd_by_id(ctx, command_id);
                                if (!rv)
-                                       dbg("fail to dequeue data\n");
+                                       dbg("Failed to de-queue data\n");
                        }
 
 #if defined(TIZEN_SUPPORT_SAT_ICON)
@@ -677,8 +749,10 @@ gboolean dbus_plugin_sat_notification(struct custom_data *ctx, CoreObject *sourc
                        telephony_sat_emit_select_item(sat, command_id, help_info, selected_text, text_len,
                                default_item_id, menu_cnt, menu_items);
 #endif
+
                        g_free(selected_text);
-                       } break;
+               }
+               break;
 
                case SAT_PROATV_CMD_GET_INKEY: {
                        GVariant *get_inkey = NULL;
@@ -691,14 +765,18 @@ gboolean dbus_plugin_sat_notification(struct custom_data *ctx, CoreObject *sourc
 #endif
                        int ret;
 
-                       get_inkey = sat_manager_get_inkey_noti(ctx, cp_name, (struct tel_sat_get_inkey_tlv*) &p_ind->proactive_ind_data.get_inkey, p_ind->decode_err_code);
+                       get_inkey = sat_manager_get_inkey_noti(ctx, cp_name,
+                               (struct tel_sat_get_inkey_tlv *)&p_ind->proactive_ind_data.get_inkey,
+                               p_ind->decode_err_code);
 
                        if (!get_inkey) {
-                               dbg("no get inkey data");
+                               dbg("NO Get Inkey data");
                                return TRUE;
                        }
 
-                       dbg("get inkey type_format(%s)", g_variant_get_type_string(get_inkey));
+                       dbg("PROATV_CMD_GET_INKEY - type_format: [%s]",
+                               g_variant_get_type_string(get_inkey));
+
 #if defined(TIZEN_SUPPORT_SAT_ICON)
                        g_variant_get(get_inkey, "(iiibbsii@v)", &command_id, &key_type, &input_character_mode,
                                &b_numeric, &b_help_info, &text, &text_len, &duration, &icon_id);
@@ -706,15 +784,20 @@ gboolean dbus_plugin_sat_notification(struct custom_data *ctx, CoreObject *sourc
                        g_variant_get(get_inkey, "(iiibbsii)", &command_id, &key_type, &input_character_mode,
                                &b_numeric, &b_help_info, &text, &text_len, &duration);
 #endif
-                       ret = sat_ui_support_launch_sat_ui(SAT_PROATV_CMD_GET_INKEY, get_inkey, slot_id);
+
+                       ret = sat_ui_support_launch_sat_ui(SAT_PROATV_CMD_GET_INKEY,
+                               get_inkey, slot_id);
                        if (!ret) {
                                int rv;
-                               dbg("fail to launch sat-ui, remove the queued data!!\n");
+
+                               err("Failed to launch 'sat-ui', remove the queued data!!!");
+
                                if (!sat_manager_handle_sat_ui_launch_fail(ctx, cp_name, p_ind))
-                                       dbg("Fail to send terminal response\n");
+                                       dbg("Failed to send Terminal Response!!!");
+
                                rv = sat_manager_remove_cmd_by_id(ctx, command_id);
                                if (!rv)
-                                       dbg("fail to dequeue data\n");
+                                       dbg("Failed to de-queue data\n");
                        }
 
 #if defined(TIZEN_SUPPORT_SAT_ICON)
@@ -724,8 +807,10 @@ gboolean dbus_plugin_sat_notification(struct custom_data *ctx, CoreObject *sourc
                        telephony_sat_emit_get_inkey(sat, command_id, key_type, input_character_mode,
                                b_numeric, b_help_info, text, text_len, duration);
 #endif
+
                        g_free(text);
-                       } break;
+               }
+               break;
 
                case SAT_PROATV_CMD_GET_INPUT: {
                        GVariant *get_input = NULL;
@@ -737,14 +822,17 @@ gboolean dbus_plugin_sat_notification(struct custom_data *ctx, CoreObject *sourc
 #if defined(TIZEN_SUPPORT_SAT_ICON)
                        GVariant *icon_id;
 #endif
-                       get_input = sat_manager_get_input_noti(ctx, cp_name, (struct tel_sat_get_input_tlv*) &p_ind->proactive_ind_data.get_input, p_ind->decode_err_code);
-
+                       get_input = sat_manager_get_input_noti(ctx, cp_name,
+                               (struct tel_sat_get_input_tlv *)&p_ind->proactive_ind_data.get_input,
+                               p_ind->decode_err_code);
                        if (!get_input) {
-                               dbg("no get input data");
+                               dbg("NO Get Input data");
                                return TRUE;
                        }
 
-                       dbg("get input type_format(%s)", g_variant_get_type_string(get_input));
+                       dbg("PROATV_CMD_GET_INPUT - type_format: [%s]",
+                               g_variant_get_type_string(get_input));
+
 #if defined(TIZEN_SUPPORT_SAT_ICON)
                        g_variant_get(get_input, "(iibbbsiiisi@v)", &command_id,
                                &input_character_mode, &b_numeric, &b_help_info,
@@ -756,15 +844,20 @@ gboolean dbus_plugin_sat_notification(struct custom_data *ctx, CoreObject *sourc
                                &b_echo_input, &text, &text_len, &rsp_len_max,
                                &rsp_len_min, &def_text, &def_text_len);
 #endif
-                       ret = sat_ui_support_launch_sat_ui(SAT_PROATV_CMD_GET_INPUT, get_input, slot_id);
+
+                       ret = sat_ui_support_launch_sat_ui(SAT_PROATV_CMD_GET_INPUT,
+                               get_input, slot_id);
                        if (!ret) {
                                int rv;
-                               dbg("fail to launch sat-ui, remove the queued data!!\n");
+
+                               err("Failed to launch 'sat-ui', remove the queued data!!!");
+
                                if (!sat_manager_handle_sat_ui_launch_fail(ctx, cp_name, p_ind))
-                                       dbg("Fail to send terminal response\n");
+                                       dbg("Failed to send Terminal Response!!!");
+
                                rv = sat_manager_remove_cmd_by_id(ctx, command_id);
                                if (!rv)
-                                       dbg("fail to dequeue data\n");
+                                       dbg("Failed to de-queue data\n");
                        }
 
 #if defined(TIZEN_SUPPORT_SAT_ICON)
@@ -774,9 +867,11 @@ gboolean dbus_plugin_sat_notification(struct custom_data *ctx, CoreObject *sourc
                        telephony_sat_emit_get_input(sat, command_id, input_character_mode, b_numeric, b_help_info,
                                b_echo_input, text, text_len, rsp_len_max, rsp_len_min, def_text, def_text_len);
 #endif
+
                        g_free(text);
                        g_free(def_text);
-                       } break;
+               }
+               break;
 
                case SAT_PROATV_CMD_PLAY_TONE: {
                        GVariant *play_tone = NULL;
@@ -787,28 +882,35 @@ gboolean dbus_plugin_sat_notification(struct custom_data *ctx, CoreObject *sourc
 #if defined(TIZEN_SUPPORT_SAT_ICON)
                        GVariant *icon_id;
 #endif
-                       play_tone = sat_manager_play_tone_noti(ctx, cp_name, (struct tel_sat_play_tone_tlv*) &p_ind->proactive_ind_data.play_tone);
 
+                       play_tone = sat_manager_play_tone_noti(ctx, cp_name,
+                               (struct tel_sat_play_tone_tlv *)&p_ind->proactive_ind_data.play_tone);
                        if (!play_tone) {
-                               dbg("no play tone data");
+                               dbg("NO Play Tone data");
                                return TRUE;
                        }
 
-                       dbg("play tone type_format(%s)", g_variant_get_type_string(play_tone));
+                       dbg("PROATV_CMD_PLAY_TONE - type_format: [%s]",
+                               g_variant_get_type_string(play_tone));
+
 #if defined(TIZEN_SUPPORT_SAT_ICON)
                        g_variant_get(play_tone, "(isi@vii)", &command_id, &text, &text_len, &icon_id, &tone_type, &duration);
 #else
                        g_variant_get(play_tone, "(isiii)", &command_id, &text, &text_len, &tone_type, &duration);
 #endif
+
                        ret = sat_ui_support_launch_sat_ui(SAT_PROATV_CMD_PLAY_TONE, play_tone, slot_id);
                        if (!ret) {
                                int rv;
-                               dbg("fail to launch sat-ui, remove the queued data!!\n");
+
+                               err("Failed to launch 'sat-ui', remove the queued data!!!");
+
                                if (!sat_manager_handle_sat_ui_launch_fail(ctx, cp_name, p_ind))
-                                       dbg("Fail to send terminal response\n");
+                                       dbg("Failed to send Terminal Response!!!");
+
                                rv = sat_manager_remove_cmd_by_id(ctx, command_id);
                                if (!rv)
-                                       dbg("fail to dequeue data\n");
+                                       dbg("Failed to de-queue data\n");
                        }
 
 #if defined(TIZEN_SUPPORT_SAT_ICON)
@@ -816,8 +918,10 @@ gboolean dbus_plugin_sat_notification(struct custom_data *ctx, CoreObject *sourc
 #else
                        telephony_sat_emit_play_tone(sat, command_id, text, text_len, tone_type, duration);
 #endif
+
                        g_free(text);
-                       } break;
+               }
+               break;
 
                case SAT_PROATV_CMD_SEND_SMS: {
                        GVariant *send_sms = NULL;
@@ -829,14 +933,17 @@ gboolean dbus_plugin_sat_notification(struct custom_data *ctx, CoreObject *sourc
 #if defined(TIZEN_SUPPORT_SAT_ICON)
                        GVariant *icon_id;
 #endif
-                       send_sms = sat_manager_send_sms_noti(ctx, cp_name, (struct tel_sat_send_sms_tlv*) &p_ind->proactive_ind_data.send_sms);
 
+                       send_sms = sat_manager_send_sms_noti(ctx, cp_name,
+                               (struct tel_sat_send_sms_tlv *)&p_ind->proactive_ind_data.send_sms);
                        if (!send_sms) {
-                               dbg("no send sms data");
+                               dbg("NO Send SMS data");
                                return TRUE;
                        }
 
-                       dbg("send sms type_format(%s)", g_variant_get_type_string(send_sms));
+                       dbg("PROATV_CMD_SEND_SMS - type_format: [%s]",
+                               g_variant_get_type_string(send_sms));
+
 #if defined(TIZEN_SUPPORT_SAT_ICON)
                        g_variant_get(send_sms, "(isi@vbiisii@vi)", &command_id,
                                &text, &text_len, &icon_id, &b_packing_required, &ton, &npi,
@@ -846,40 +953,51 @@ gboolean dbus_plugin_sat_notification(struct custom_data *ctx, CoreObject *sourc
                                &text, &text_len, &b_packing_required, &ton, &npi,
                                &dialling_number, &number_len, &tpdu_type, &tpdu_data, &tpdu_data_len);
 #endif
-                       dbg("check display text : text(%s) text len(%d)", text, text_len);
+
+                       dbg("Display text - text: [%s] text len: [%d]", text, text_len);
                        if (text_len > 1 && (g_strcmp0(text, "") != 0)) {
                                GVariant *ui_info = NULL;
                                gboolean user_confirm = FALSE;
                                int ret;
-                               dbg("text should be displayed by ui");
-                               dbg("send sms is pending!!!");
+
+                               dbg("Text should be displayed by UI - Send SMS is pending!!!");
 
 #if defined(TIZEN_SUPPORT_SAT_ICON)
                                ui_info = g_variant_new("(isibv)", command_id, text, text_len, user_confirm, icon_id);
 #else
                                ui_info = g_variant_new("(isib)", command_id, text, text_len, user_confirm);
 #endif
-                               ret = sat_ui_support_launch_sat_ui(SAT_PROATV_CMD_SEND_SMS, ui_info, slot_id);
+
+                               ret = sat_ui_support_launch_sat_ui(SAT_PROATV_CMD_SEND_SMS,
+                                       ui_info, slot_id);
                                if (!ret) {
                                        int rv;
-                                       dbg("fail to launch sat-ui, remove the queued data!!\n");
+
+                                       err("Failed to launch 'sat-ui', remove the queued data!!!");
+
                                        if (!sat_manager_handle_sat_ui_launch_fail(ctx, cp_name, p_ind))
-                                               dbg("Fail to send terminal response\n");
+                                               dbg("Failed to send Terminal Response!!!");
+
                                        rv = sat_manager_remove_cmd_by_id(ctx, command_id);
                                        if (!rv)
-                                               dbg("fail to dequeue data\n");
+                                               dbg("Failed to de-queue data\n");
                                }
+
                                g_free(text);
                                g_free(dialling_number);
+
                                return TRUE;
                        }
+
 #if !defined(TIZEN_PLATFORM_USE_QCOM_QMI)
                        telephony_sat_emit_send_sms(sat, command_id, text, text_len, b_packing_required,
                                ton, npi, dialling_number, number_len, tpdu_type, tpdu_data, tpdu_data_len);
 #endif
+
                        g_free(text);
                        g_free(dialling_number);
-                       } break;
+               }
+               break;
 
                case SAT_PROATV_CMD_SEND_SS: {
                        GVariant *send_ss = NULL;
@@ -889,14 +1007,17 @@ gboolean dbus_plugin_sat_notification(struct custom_data *ctx, CoreObject *sourc
 #if defined(TIZEN_SUPPORT_SAT_ICON)
                        GVariant *icon_id;
 #endif
-                       send_ss = sat_manager_send_ss_noti(ctx, cp_name, (struct tel_sat_send_ss_tlv*) &p_ind->proactive_ind_data.send_ss);
 
+                       send_ss = sat_manager_send_ss_noti(ctx, cp_name,
+                               (struct tel_sat_send_ss_tlv *)&p_ind->proactive_ind_data.send_ss);
                        if (!send_ss) {
-                               dbg("no send ss data");
+                               dbg("NO Send SS data");
                                return TRUE;
                        }
 
-                       dbg("send ss type_format(%s)", g_variant_get_type_string(send_ss));
+                       dbg("PROATV_CMD_SEND_SS - type_format: [%s]",
+                               g_variant_get_type_string(send_ss));
+
 #if defined(TIZEN_SUPPORT_SAT_ICON)
                        g_variant_get(send_ss, "(isi@viiis)", &command_id, &text, &text_len, &icon_id,
                                                        &ton, &npi, &ss_str_len, &ss_string);
@@ -904,41 +1025,57 @@ gboolean dbus_plugin_sat_notification(struct custom_data *ctx, CoreObject *sourc
                        g_variant_get(send_ss, "(isiiiis)", &command_id, &text, &text_len,
                                                        &ton, &npi, &ss_str_len, &ss_string);
 #endif
-                       dbg("check display text : text(%s) text len(%d)", text, text_len);
+
+                       dbg("Display text - text: [%s] text len: [%d]", text, text_len);
                        if (text_len > 1 && (g_strcmp0(text, "") != 0)) {
                                GVariant *ui_info = NULL;
                                gboolean user_confirm = FALSE;
                                int ret;
-                               dbg("text should be displayed by ui");
-                               dbg("send ss is pending!!!");
+
+                               dbg("Text should be displayed by UI - Send SS is pending!!!");
 
 #if defined(TIZEN_SUPPORT_SAT_ICON)
                                ui_info = g_variant_new("(isibv)", command_id, text, text_len, user_confirm, icon_id);
 #else
                                ui_info = g_variant_new("(isib)", command_id, text, text_len, user_confirm);
 #endif
-                               ret = sat_ui_support_launch_sat_ui(SAT_PROATV_CMD_NONE, ui_info, slot_id);
+
+                               ret = sat_ui_support_launch_sat_ui(SAT_PROATV_CMD_NONE,
+                                       ui_info, slot_id);
                                if (!ret) {
                                        int rv;
-                                       dbg("fail to launch sat-ui, remove the queued data!!\n");
+
+                                       err("Failed to launch 'sat-ui', remove the queued data!!!");
+
                                        if (!sat_manager_handle_sat_ui_launch_fail(ctx, cp_name, p_ind))
-                                               dbg("Fail to send terminal response\n");
+                                               dbg("Failed to send Terminal Response!!!");
+
                                        rv = sat_manager_remove_cmd_by_id(ctx, command_id);
                                        if (!rv)
-                                               dbg("fail to dequeue data\n");
+                                               dbg("Failed to de-queue data\n");
                                }
+
                                g_free(text);
                                g_free(ss_string);
+
                                return TRUE;
                        }
+
 #if !defined(TIZEN_PLATFORM_USE_QCOM_QMI)
-                       telephony_sat_emit_send_ss(sat, command_id, text, text_len, ton, npi, ss_string);
-                       /* tizen ciss */
-                       sat_ui_support_launch_ciss_application(SAT_PROATV_CMD_SEND_SS, send_ss, slot_id);
+                       telephony_sat_emit_send_ss(sat,
+                               command_id, text, text_len, ton, npi, ss_string);
+
+                       /*
+                        * Tizen CISS
+                        */
+                       sat_ui_support_launch_ciss_application(SAT_PROATV_CMD_SEND_SS,
+                               send_ss, slot_id);
 #endif
+
                        g_free(text);
                        g_free(ss_string);
-                       } break;
+               }
+               break;
 
                case SAT_PROATV_CMD_SEND_USSD: {
                        GVariant *send_ussd = NULL;
@@ -949,53 +1086,72 @@ gboolean dbus_plugin_sat_notification(struct custom_data *ctx, CoreObject *sourc
 #if defined(TIZEN_SUPPORT_SAT_ICON)
                        GVariant *icon_id;
 #endif
-                       send_ussd = sat_manager_send_ussd_noti(ctx, cp_name, (struct tel_sat_send_ussd_tlv*) &p_ind->proactive_ind_data.send_ussd);
 
+                       send_ussd = sat_manager_send_ussd_noti(ctx, cp_name,
+                               (struct tel_sat_send_ussd_tlv *)&p_ind->proactive_ind_data.send_ussd);
                        if (!send_ussd) {
-                               dbg("no send ussd data");
+                               dbg("NO Send USSD data");
                                return TRUE;
                        }
 
-                       dbg("send ussd type_format(%s)", g_variant_get_type_string(send_ussd));
+                       dbg("PROATV_CMD_SEND_USSD - type_format: [%s]",
+                               g_variant_get_type_string(send_ussd));
+
 #if defined(TIZEN_SUPPORT_SAT_ICON)
                        g_variant_get(send_ussd, "(isi@vyis)", &command_id, &text, &text_len, &icon_id, &dcs, &ussd_str_len, &ussd_string);
 #else
                        g_variant_get(send_ussd, "(isiyis)", &command_id, &text, &text_len, &dcs, &ussd_str_len, &ussd_string);
 #endif
-                       dbg("check display text : text(%s) text len(%d)", text, text_len);
+
+                       dbg("Display text - text: [%s] text len: [%d]", text, text_len);
                        if (text_len > 1 && (g_strcmp0(text, "") != 0)) {
                                GVariant *ui_info = NULL;
                                gboolean user_confirm = FALSE;
                                int ret;
-                               dbg("text should be displayed by ui");
-                               dbg("send ussd is pending!!!");
+
+                               dbg("Text should be displayed by UI -Send USSD is pending!!!");
+
 #if defined(TIZEN_SUPPORT_SAT_ICON)
                                ui_info = g_variant_new("(isibv)", command_id, text, text_len, user_confirm, icon_id);
 #else
                                ui_info = g_variant_new("(isib)", command_id, text, text_len, user_confirm);
 #endif
-                               ret = sat_ui_support_launch_sat_ui(SAT_PROATV_CMD_NONE, ui_info, slot_id);
+
+                               ret = sat_ui_support_launch_sat_ui(SAT_PROATV_CMD_NONE,
+                                       ui_info, slot_id);
                                if (!ret) {
                                        int rv;
-                                       dbg("fail to launch sat-ui, remove the queued data!!\n");
+
+                                       err("Failed to launch 'sat-ui', remove the queued data!!!");
+
                                        if (!sat_manager_handle_sat_ui_launch_fail(ctx, cp_name, p_ind))
-                                               dbg("Fail to send terminal response\n");
+                                               dbg("Failed to send Terminal Response!!!");
+
                                        rv = sat_manager_remove_cmd_by_id(ctx, command_id);
                                        if (!rv)
-                                               dbg("fail to dequeue data\n");
+                                               dbg("Failed to de-queue data\n");
                                }
+
                                g_free(text);
                                g_free(ussd_string);
+
                                return TRUE;
                        }
+
 #if !defined(TIZEN_PLATFORM_USE_QCOM_QMI)
-                       telephony_sat_emit_setup_ussd(sat, command_id, text, text_len, dcs, ussd_string);
-                       /* tizen ciss ui */
-                       sat_ui_support_launch_ciss_application(SAT_PROATV_CMD_SEND_USSD, send_ussd, slot_id);
+                       telephony_sat_emit_setup_ussd(sat,
+                               command_id, text, text_len, dcs, ussd_string);
+
+                       /*
+                        * Tizen CISS UI
+                        */
+                       sat_ui_support_launch_ciss_application(SAT_PROATV_CMD_SEND_USSD,
+                               send_ussd, slot_id);
 #endif
                        g_free(text);
                        g_free(ussd_string);
-                       } break;
+               }
+               break;
 
                case SAT_PROATV_CMD_SETUP_CALL: {
                        GVariant *setup_call = NULL;
@@ -1004,73 +1160,105 @@ gboolean dbus_plugin_sat_notification(struct custom_data *ctx, CoreObject *sourc
 #if defined(TIZEN_SUPPORT_SAT_ICON)
                        GVariant *icon_id;
 #endif
-                       setup_call = sat_manager_setup_call_noti(ctx, cp_name, (struct tel_sat_setup_call_tlv*) &p_ind->proactive_ind_data.setup_call);
 
+                       setup_call = sat_manager_setup_call_noti(ctx, cp_name,
+                               (struct tel_sat_setup_call_tlv *)&p_ind->proactive_ind_data.setup_call);
                        if (!setup_call) {
-                               dbg("no setup call data");
+                               dbg("NO Setup Call data");
                                return TRUE;
                        }
 
-                       dbg("setup call type_format(%s)", g_variant_get_type_string(setup_call));
+                       dbg("PROATV_CMD_SETUP_CALL - type_format: [%s]",
+                               g_variant_get_type_string(setup_call));
+
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                       g_variant_get(setup_call, "(isisi@visi)", &command_id, &confirmed_text, &confirmed_text_len, &text, &text_len, &icon_id, &call_type, &call_number, &duration);
+                       g_variant_get(setup_call, "(isisi@visi)", &command_id,
+                               &confirmed_text, &confirmed_text_len,
+                               &text, &text_len, &icon_id, &call_type,
+                               &call_number, &duration);
 #else
-                       g_variant_get(setup_call, "(isisiisi)", &command_id, &confirmed_text, &confirmed_text_len, &text, &text_len, &call_type, &call_number, &duration);
+                       g_variant_get(setup_call, "(isisiisi)", &command_id,
+                               &confirmed_text, &confirmed_text_len,
+                               &text, &text_len, &call_type, &call_number, &duration);
 #endif
-                       dbg("check display text : text(%s) text len(%d)", confirmed_text, confirmed_text_len);
+
+                       dbg("Display text - text: [%s] text len: [%d]", confirmed_text, confirmed_text_len);
                        if (confirmed_text_len > 1 && (g_strcmp0(confirmed_text, "") != 0)) {
                                GVariant *ui_info = NULL;
                                gboolean user_confirm = TRUE;
                                int ret;
-                               dbg("text should be displayed by ui");
-                               dbg("setup call is pending!!!");
+
+                               dbg("Text should be displayed by UI - Setup call is pending!!!");
+
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                               ui_info = g_variant_new("(isibv)", command_id, confirmed_text, confirmed_text_len, user_confirm, icon_id);
+                               ui_info = g_variant_new("(isibv)", command_id,
+                                       confirmed_text, confirmed_text_len,
+                                       user_confirm, icon_id);
 #else
-                               ui_info = g_variant_new("(isib)", command_id, confirmed_text, confirmed_text_len, user_confirm);
+                               ui_info = g_variant_new("(isib)", command_id,
+                                       confirmed_text, confirmed_text_len,
+                                       user_confirm);
 #endif
-                               ret = sat_ui_support_launch_sat_ui(SAT_PROATV_CMD_NONE, ui_info, slot_id);
+
+                               ret = sat_ui_support_launch_sat_ui(SAT_PROATV_CMD_NONE,
+                                       ui_info, slot_id);
                                if (!ret) {
                                        int rv;
-                                       dbg("fail to launch sat-ui, remove the queued data!!\n");
+
+                                       err("Failed to launch 'sat-ui', remove the queued data!!!");
+
                                        if (!sat_manager_handle_sat_ui_launch_fail(ctx, cp_name, p_ind))
-                                               dbg("Fail to send terminal response\n");
+                                               dbg("Failed to send Terminal Response!!!");
+
                                        rv = sat_manager_remove_cmd_by_id(ctx, command_id);
                                        if (!rv)
-                                               dbg("fail to dequeue data\n");
+                                               dbg("Failed to de-queue data\n");
                                }
+
                                g_free(text);
                                g_free(call_number);
+
                                return TRUE;
                        }
+                       /* In case of No user confirm phase AlphaID in SETUP CALL noti.
+                         * Ref.) ETSI TS 102 223 : Section 6.4.13 and 6.6.12
+                         */
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                       telephony_sat_emit_setup_call(sat, command_id, confirmed_text, confirmed_text_len, text, text_len, icon_id, call_type, call_number, duration);
+                       telephony_sat_emit_setup_call(sat,
+                               command_id, confirmed_text, confirmed_text_len,
+                               text, text_len, icon_id, call_type, call_number, duration);
 #else
-                       telephony_sat_emit_setup_call(sat, command_id, confirmed_text, confirmed_text_len, text, text_len, call_type, call_number, duration);
+                       telephony_sat_emit_setup_call(sat,
+                               command_id, confirmed_text, confirmed_text_len,
+                               text, text_len, call_type, call_number, duration);
 #endif
                        g_free(text);
                        g_free(call_number);
-
-                       /* tizen call ui in no alpha id case */
-                       sat_ui_support_launch_call_application(SAT_PROATV_CMD_SETUP_CALL, setup_call, slot_id);
-                       } break;
+               }
+               break;
 
                case SAT_PROATV_CMD_SETUP_EVENT_LIST: {
                        GVariant *event_list = NULL;
                        gint event_cnt;
                        GVariant *evt_list;
-                       event_list = sat_manager_setup_event_list_noti(ctx, cp_name, (struct tel_sat_setup_event_list_tlv*) &p_ind->proactive_ind_data.setup_event_list);
 
+                       event_list = sat_manager_setup_event_list_noti(ctx, cp_name,
+                               (struct tel_sat_setup_event_list_tlv *)&p_ind->proactive_ind_data.setup_event_list);
                        if (!event_list) {
-                               dbg("no setup event list data");
+                               dbg("NO Setup Event list data");
                                return TRUE;
                        }
 
-                       dbg("setup event list type_format(%s)", g_variant_get_type_string(event_list));
+                       dbg("PROATV_CMD_SETUP_EVENT_LIST - type_format: [%s]",
+                               g_variant_get_type_string(event_list));
+
                        g_variant_get(event_list, "(i@v)", &event_cnt, &evt_list);
                        telephony_sat_emit_setup_event_list(sat, event_cnt, evt_list);
 
-                       /* bip proactive command is only handled by BIP Manager */
+                       /*
+                        * BIP pro-active command is only handled
+                        * by BIP Manager
+                        */
                        {
                                GDBusConnection *conn = NULL;
                                const gchar *g_path = NULL;
@@ -1078,11 +1266,19 @@ gboolean dbus_plugin_sat_notification(struct custom_data *ctx, CoreObject *sourc
                                conn = g_dbus_object_manager_server_get_connection(ctx->manager);
                                g_path = g_dbus_object_get_object_path(G_DBUS_OBJECT(object));
 
-                               /* TODO: SAT Event Downloader should execute event_list as well. */
-                               sat_ui_support_exec_evtdw(conn, g_path, SAT_PROATV_CMD_SETUP_EVENT_LIST, event_list);
-                               sat_ui_support_exec_bip(conn, g_path, SAT_PROATV_CMD_SETUP_EVENT_LIST, event_list);
+                               /*
+                                * TODO -
+                                * SAT Event Downloader should execute
+                                * event_list as well.
+                                */
+                               sat_ui_support_exec_evtdw(conn, g_path,
+                                       SAT_PROATV_CMD_SETUP_EVENT_LIST, event_list);
+
+                               sat_ui_support_exec_bip(conn, g_path,
+                                       SAT_PROATV_CMD_SETUP_EVENT_LIST, event_list);
                        }
-                       } break;
+               }
+               break;
 
                case SAT_PROATV_CMD_SETUP_IDLE_MODE_TEXT: {
                        GVariant *setup_idle_mode = NULL;
@@ -1092,36 +1288,51 @@ gboolean dbus_plugin_sat_notification(struct custom_data *ctx, CoreObject *sourc
 #if defined(TIZEN_SUPPORT_SAT_ICON)
                        GVariant *icon_id;
 #endif
-                       setup_idle_mode = sat_manager_setup_idle_mode_text_noti(ctx, cp_name, (struct tel_sat_setup_idle_mode_text_tlv*) &p_ind->proactive_ind_data.setup_idle_mode_text, p_ind->decode_err_code);
-
+                       setup_idle_mode = sat_manager_setup_idle_mode_text_noti(ctx, cp_name,
+                               (struct tel_sat_setup_idle_mode_text_tlv *)&p_ind->proactive_ind_data.setup_idle_mode_text,
+                               p_ind->decode_err_code);
                        if (!setup_idle_mode) {
-                               dbg("no setup idle mode text data");
+                               dbg("NO Setup Idle mode text data");
                                return TRUE;
                        }
 
-                       dbg("setup idle mode text type_format(%s)", g_variant_get_type_string(setup_idle_mode));
+                       dbg("PROATV_CMD_SETUP_IDLE_MODE_TEXT - type_format: [%s]",
+                               g_variant_get_type_string(setup_idle_mode));
+
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                       g_variant_get(setup_idle_mode, "(isi@v)", &command_id, &text, &text_len, &icon_id);
+                       g_variant_get(setup_idle_mode, "(isi@v)", &command_id,
+                               &text, &text_len, &icon_id);
 #else
-                       g_variant_get(setup_idle_mode, "(isi)", &command_id, &text, &text_len);
+                       g_variant_get(setup_idle_mode, "(isi)", &command_id,
+                               &text, &text_len);
 #endif
-                       ret = sat_ui_support_launch_sat_ui(SAT_PROATV_CMD_SETUP_IDLE_MODE_TEXT, setup_idle_mode, slot_id);
+
+                       ret = sat_ui_support_launch_sat_ui(SAT_PROATV_CMD_SETUP_IDLE_MODE_TEXT,
+                               setup_idle_mode, slot_id);
                        if (!ret) {
                                int rv;
-                               dbg("fail to launch sat-ui, remove the queued data!!\n");
+
+                               err("Failed to launch 'sat-ui', remove the queued data!!!");
+
                                if (!sat_manager_handle_sat_ui_launch_fail(ctx, cp_name, p_ind))
-                                       dbg("Fail to send terminal response\n");
+                                       dbg("Failed to send Terminal Response!!!");
+
                                rv = sat_manager_remove_cmd_by_id(ctx, command_id);
                                if (!rv)
-                                       dbg("fail to dequeue data\n");
+                                       dbg("Failed to de-queue data\n");
                        }
+
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                       telephony_sat_emit_setup_idle_mode_text(sat, command_id, text, text_len, icon_id);
+                       telephony_sat_emit_setup_idle_mode_text(sat,
+                               command_id, text, text_len, icon_id);
 #else
-                       telephony_sat_emit_setup_idle_mode_text(sat, command_id, text, text_len);
+                       telephony_sat_emit_setup_idle_mode_text(sat,
+                       command_id, text, text_len);
 #endif
+
                        g_free(text);
-                       } break;
+               }
+               break;
 
                case SAT_PROATV_CMD_OPEN_CHANNEL: {
                        GVariant *open_channel = NULL;
@@ -1134,14 +1345,17 @@ gboolean dbus_plugin_sat_notification(struct custom_data *ctx, CoreObject *sourc
 #if defined(TIZEN_SUPPORT_SAT_ICON)
                        GVariant *icon_id;
 #endif
-                       open_channel = sat_manager_open_channel_noti(ctx, cp_name, (struct tel_sat_open_channel_tlv*) &p_ind->proactive_ind_data.open_channel);
 
+                       open_channel = sat_manager_open_channel_noti(ctx, cp_name,
+                               (struct tel_sat_open_channel_tlv *)&p_ind->proactive_ind_data.open_channel);
                        if (!open_channel) {
-                               dbg("no open channel data");
+                               dbg("NO Open Channel data");
                                return TRUE;
                        }
 
-                       dbg("open channel type_format(%s)", g_variant_get_type_string(open_channel));
+                       dbg("PROATV_CMD_OPEN_CHANNEL - type_format: [%s]",
+                               g_variant_get_type_string(open_channel));
+
 #if defined(TIZEN_SUPPORT_SAT_ICON)
                        g_variant_get(open_channel, "(isi@vbbbi@viiiis@v)", &command_id,
                                &text, &text_len, &icon_id, &immediate_link, &auto_reconnection, &bg_mode,
@@ -1153,39 +1367,59 @@ gboolean dbus_plugin_sat_notification(struct custom_data *ctx, CoreObject *sourc
                                &bearer_type, &bearer_param, &buffer_size, &protocol_type,
                                &port_number, &dest_addr_type, &dest_address, &bearer_detail);
 #endif
-                       dbg("check display text : text(%s) text len(%d)", text, text_len);
+
+                       dbg("Display text - text: [%s] text len: [%d]", text, text_len);
                        if (text_len > 1 && (g_strcmp0(text, "") != 0)) {
                                GVariant *ui_info = NULL;
                                gboolean user_confirm = TRUE;
                                int ret;
-                               dbg("text should be displayed by ui");
-                               dbg("open channel text is displayed!!!");
+
+                               dbg("Text should be displayed by UI- Open Channel text is displayed!!!");
+
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                               ui_info = g_variant_new("(isibv)", command_id, text, text_len, user_confirm, icon_id);
+                               ui_info = g_variant_new("(isibv)", command_id,
+                                       text, text_len, user_confirm, icon_id);
 #else
-                               ui_info = g_variant_new("(isib)", command_id, text, text_len, user_confirm);
+                               ui_info = g_variant_new("(isib)", command_id,
+                                       text, text_len, user_confirm);
 #endif
-                               ret = sat_ui_support_launch_sat_ui(SAT_PROATV_CMD_NONE, ui_info, slot_id);
-                                       if (!ret) {
+
+                               ret = sat_ui_support_launch_sat_ui(SAT_PROATV_CMD_NONE,
+                                       ui_info, slot_id);
+                               if (!ret) {
                                        int rv;
-                                       dbg("fail to launch sat-ui, remove the queued data!!\n");
+
+                                       err("Failed to launch 'sat-ui', remove the queued data!!!");
+
                                        if (!sat_manager_handle_sat_ui_launch_fail(ctx, cp_name, p_ind))
-                                               dbg("Fail to send terminal response\n");
+                                               dbg("Failed to send Terminal Response!!!");
+
                                        rv = sat_manager_remove_cmd_by_id(ctx, command_id);
                                        if (!rv)
-                                               dbg("fail to dequeue data\n");
+                                               dbg("Failed to de-queue data\n");
                                }
+
                                g_free(text);
                                g_free(dest_address);
+
                                return TRUE;
                        }
+
                        g_free(text);
                        g_free(dest_address);
 
-                       /*telephony_sat_emit_open_channel(sat, command_id, text, text_len, immediate_link, auto_reconnection, bg_mode,
-                               bearer_type, bearer_param, buffer_size, protocol_type, port_number, dest_addr_type, dest_address, bearer_detail);*/
+#if 0
+                       telephony_sat_emit_open_channel(sat, command_id,
+                               text, text_len, immediate_link, auto_reconnection, bg_mode,
+                               bearer_type, bearer_param, buffer_size, protocol_type, port_number,
+                               dest_addr_type, dest_address, bearer_detail);
+#endif
+
 #if !defined(TIZEN_PLATFORM_USE_QCOM_QMI)
-                       /* bip proactive command is only handled by BIP Manager */
+                       /*
+                        * BIP pro-active command is only handled
+                        * by BIP Manager
+                        */
                        {
                                GDBusConnection *conn = NULL;
                                const gchar *g_path = NULL;
@@ -1193,10 +1427,12 @@ gboolean dbus_plugin_sat_notification(struct custom_data *ctx, CoreObject *sourc
                                conn = g_dbus_object_manager_server_get_connection(ctx->manager);
                                g_path = g_dbus_object_get_object_path(G_DBUS_OBJECT(object));
 
-                               sat_ui_support_exec_bip(conn, g_path, SAT_PROATV_CMD_OPEN_CHANNEL, open_channel);
+                               sat_ui_support_exec_bip(conn, g_path,
+                                       SAT_PROATV_CMD_OPEN_CHANNEL, open_channel);
                        }
 #endif
-                       } break;
+               }
+               break;
 
                case SAT_PROATV_CMD_CLOSE_CHANNEL: {
                        GVariant *close_channel = NULL;
@@ -1205,23 +1441,38 @@ gboolean dbus_plugin_sat_notification(struct custom_data *ctx, CoreObject *sourc
 #if defined(TIZEN_SUPPORT_SAT_ICON)
                        GVariant *icon_id;
 #endif
-                       close_channel = sat_manager_close_channel_noti(ctx, cp_name, (struct tel_sat_close_channel_tlv*) &p_ind->proactive_ind_data.close_channel);
 
+                       close_channel = sat_manager_close_channel_noti(ctx, cp_name,
+                               (struct tel_sat_close_channel_tlv *)&p_ind->proactive_ind_data.close_channel);
                        if (!close_channel) {
-                               dbg("no close channel data");
+                               dbg("NO Close Channel data");
                                return TRUE;
                        }
 
-                       /* TODO check the data for sat-ui */
-                       dbg("close channel type_format(%s)", g_variant_get_type_string(close_channel));
+                       /*
+                        * TODO -
+                        * Check the data for sat-ui
+                        */
+                       dbg("PROATV_CMD_CLOSE_CHANNEL - type_format: [%s]",
+                               g_variant_get_type_string(close_channel));
+
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                       g_variant_get(close_channel, "(isi@vi)", &command_id, &text, &text_len, &icon_id, &channel_id);
+                       g_variant_get(close_channel, "(isi@vi)", &command_id,
+                               &text, &text_len, &icon_id, &channel_id);
 #else
-                       g_variant_get(close_channel, "(isii)", &command_id, &text, &text_len, &channel_id);
+                       g_variant_get(close_channel, "(isii)", &command_id,
+                               &text, &text_len, &channel_id);
 #endif
 
-                       /*telephony_sat_emit_close_channel(sat, command_id, text, text_len, channel_id);*/
-                       /* bip proactive command is only handled by BIP Manager */
+#if 0
+                       telephony_sat_emit_close_channel(sat,
+                               command_id, text, text_len, channel_id);
+#endif
+
+                       /*
+                        * BIP pro-active command is only handled
+                        * by BIP Manager
+                        */
                        {
                                GDBusConnection *conn = NULL;
                                const gchar *g_path = NULL;
@@ -1229,11 +1480,13 @@ gboolean dbus_plugin_sat_notification(struct custom_data *ctx, CoreObject *sourc
                                conn = g_dbus_object_manager_server_get_connection(ctx->manager);
                                g_path = g_dbus_object_get_object_path(G_DBUS_OBJECT(object));
 
-                               sat_ui_support_exec_bip(conn, g_path, SAT_PROATV_CMD_CLOSE_CHANNEL, close_channel);
+                               sat_ui_support_exec_bip(conn, g_path,
+                                       SAT_PROATV_CMD_CLOSE_CHANNEL, close_channel);
                        }
 
                        g_free(text);
-                       } break;
+               }
+               break;
 
                case SAT_PROATV_CMD_RECEIVE_DATA: {
                        GVariant *receive_data = NULL;
@@ -1242,23 +1495,39 @@ gboolean dbus_plugin_sat_notification(struct custom_data *ctx, CoreObject *sourc
 #if defined(TIZEN_SUPPORT_SAT_ICON)
                        GVariant *icon_id;
 #endif
-                       receive_data = sat_manager_receive_data_noti(ctx, cp_name, (struct tel_sat_receive_channel_tlv*) &p_ind->proactive_ind_data.receive_data);
 
+                       receive_data = sat_manager_receive_data_noti(ctx, cp_name,
+                               (struct tel_sat_receive_channel_tlv *)&p_ind->proactive_ind_data.receive_data);
                        if (!receive_data) {
-                               dbg("no receive data data");
+                               dbg("NO Receive data data");
                                return TRUE;
                        }
 
-                       /* TODO check the data for sat-ui */
+                       /*
+                        * TODO -
+                        * Check the data for sat-ui
+                        */
+
+                       dbg("PROATV_CMD_RECEIVE_DATA - type_format: [%s]",
+                               g_variant_get_type_string(receive_data));
 
-                       dbg("receive data type_format(%s)", g_variant_get_type_string(receive_data));
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                       g_variant_get(receive_data, "(isi@vii)", &command_id, &text, &text_len, &icon_id, &channel_id, &channel_data_len);
+                       g_variant_get(receive_data, "(isi@vii)", &command_id,
+                               &text, &text_len, &icon_id, &channel_id, &channel_data_len);
 #else
-                       g_variant_get(receive_data, "(isiii)", &command_id, &text, &text_len, &channel_id, &channel_data_len);
+                       g_variant_get(receive_data, "(isiii)", &command_id,
+                               &text, &text_len, &channel_id, &channel_data_len);
 #endif
-                       /*telephony_sat_emit_receive_data(sat, command_id, text, text_len, channel_id, channel_data_len);*/
-                       /* bip proactive command is only handled by BIP Manager */
+
+#if 0
+                       telephony_sat_emit_receive_data(sat,
+                               command_id, text, text_len, channel_id, channel_data_len);
+#endif
+
+                       /*
+                        * BIP pro-active command is only handled
+                        * by BIP Manager
+                        */
                        {
                                GDBusConnection *conn = NULL;
                                const gchar *g_path = NULL;
@@ -1266,10 +1535,13 @@ gboolean dbus_plugin_sat_notification(struct custom_data *ctx, CoreObject *sourc
                                conn = g_dbus_object_manager_server_get_connection(ctx->manager);
                                g_path = g_dbus_object_get_object_path(G_DBUS_OBJECT(object));
 
-                               sat_ui_support_exec_bip(conn, g_path, SAT_PROATV_CMD_RECEIVE_DATA, receive_data);
+                               sat_ui_support_exec_bip(conn, g_path,
+                                       SAT_PROATV_CMD_RECEIVE_DATA, receive_data);
                        }
+
                        g_free(text);
-                       } break;
+               }
+               break;
 
                case SAT_PROATV_CMD_SEND_DATA: {
                        GVariant *send_data = NULL;
@@ -1280,22 +1552,42 @@ gboolean dbus_plugin_sat_notification(struct custom_data *ctx, CoreObject *sourc
 #if defined(TIZEN_SUPPORT_SAT_ICON)
                        GVariant *icon_id;
 #endif
-                       send_data = sat_manager_send_data_noti(ctx, cp_name, (struct tel_sat_send_channel_tlv*) &p_ind->proactive_ind_data.send_data);
 
+                       send_data = sat_manager_send_data_noti(ctx, cp_name,
+                               (struct tel_sat_send_channel_tlv *)&p_ind->proactive_ind_data.send_data);
                        if (!send_data) {
-                               dbg("no send data data");
+                               dbg("NO Send data data");
                                return TRUE;
                        }
-                       /* TODO check the data for sat-ui */
-                       dbg("send data type_format(%s)", g_variant_get_type_string(send_data));
+
+                       /*
+                        * TODO -
+                        * Check the data for sat-ui
+                        */
+
+                       dbg("PROATV_CMD_SEND_DATA - type_format: [%s]",
+                               g_variant_get_type_string(send_data));
+
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                       g_variant_get(send_data, "(isi@vib@vi)", &command_id, &text, &text_len, &icon_id, &channel_id, &send_data_immediately, &channel_data, &channel_data_len);
+                       g_variant_get(send_data, "(isi@vib@vi)", &command_id,
+                               &text, &text_len, &icon_id, &channel_id,
+                               &send_data_immediately, &channel_data, &channel_data_len);
 #else
-                       g_variant_get(send_data, "(isiib@vi)", &command_id, &text, &text_len, &channel_id, &send_data_immediately, &channel_data, &channel_data_len);
+                       g_variant_get(send_data, "(isiib@vi)", &command_id,
+                               &text, &text_len, &channel_id,
+                               &send_data_immediately, &channel_data, &channel_data_len);
+#endif
+
+#if 0
+                       telephony_sat_emit_send_data(sat,
+                               command_id, text, text_len, channel_id,
+                               send_data_immediately, channel_data, channel_data_len);
 #endif
-                       /*telephony_sat_emit_send_data(sat, command_id, text, text_len, channel_id, send_data_immediately, channel_data, channel_data_len);*/
 
-                       /* bip proactive command is only handled by BIP Manager */
+                       /*
+                        * BIP pro-active command is only handled
+                        * by BIP Manager
+                        */
                        {
                                GDBusConnection *conn = NULL;
                                const gchar *g_path = NULL;
@@ -1303,28 +1595,43 @@ gboolean dbus_plugin_sat_notification(struct custom_data *ctx, CoreObject *sourc
                                conn = g_dbus_object_manager_server_get_connection(ctx->manager);
                                g_path = g_dbus_object_get_object_path(G_DBUS_OBJECT(object));
 
-                               sat_ui_support_exec_bip(conn, g_path, SAT_PROATV_CMD_SEND_DATA, send_data);
+                               sat_ui_support_exec_bip(conn, g_path,
+                                       SAT_PROATV_CMD_SEND_DATA, send_data);
                        }
+
                        g_free(text);
-                       } break;
+               }
+               break;
 
                case SAT_PROATV_CMD_GET_CHANNEL_STATUS: {
                        GVariant *channel_status = NULL;
                        gint command_id;
 
-                       channel_status = sat_manager_get_channel_status_noti(ctx, cp_name, (struct tel_sat_get_channel_status_tlv*) &p_ind->proactive_ind_data.get_channel_status);
-
+                       channel_status = sat_manager_get_channel_status_noti(ctx, cp_name,
+                               (struct tel_sat_get_channel_status_tlv *)&p_ind->proactive_ind_data.get_channel_status);
                        if (!channel_status) {
-                               dbg("no get channel status data");
+                               dbg("NO Get Channel Status data");
                                return TRUE;
                        }
 
-                       /* TODO check the data for sat-ui */
-                       dbg("get channel status type_format(%s)", g_variant_get_type_string(channel_status));
+                       /*
+                        * TODO -
+                        * Check the data for sat-ui
+                        */
+
+                       dbg("PROATV_CMD_GET_CHANNEL_STATUS - type_format: [%s]",
+                               g_variant_get_type_string(channel_status));
+
                        g_variant_get(channel_status, "(i)", &command_id);
 
-                       /*telephony_sat_emit_get_channel_status(sat, command_id);*/
-                       /* bip proactive command is only handled by BIP Manager */
+#if 0
+                       telephony_sat_emit_get_channel_status(sat, command_id);
+#endif
+
+                       /*
+                        * BIP pro-active command is only handled
+                        * by BIP Manager
+                        */
                        {
                                GDBusConnection *conn = NULL;
                                const gchar *g_path = NULL;
@@ -1332,9 +1639,11 @@ gboolean dbus_plugin_sat_notification(struct custom_data *ctx, CoreObject *sourc
                                conn = g_dbus_object_manager_server_get_connection(ctx->manager);
                                g_path = g_dbus_object_get_object_path(G_DBUS_OBJECT(object));
 
-                               sat_ui_support_exec_bip(conn, g_path, SAT_PROATV_CMD_GET_CHANNEL_STATUS, channel_status);
+                               sat_ui_support_exec_bip(conn, g_path,
+                                       SAT_PROATV_CMD_GET_CHANNEL_STATUS, channel_status);
                        }
-                       } break;
+               }
+               break;
 
                case SAT_PROATV_CMD_REFRESH: {
                        GVariant *refresh = NULL;
@@ -1343,33 +1652,48 @@ gboolean dbus_plugin_sat_notification(struct custom_data *ctx, CoreObject *sourc
                        GVariant *file_list = NULL;
                        int ret;
 
-                       refresh = sat_manager_refresh_noti(ctx, cp_name, (struct tel_sat_refresh_tlv*) &p_ind->proactive_ind_data.refresh);
-
+                       refresh = sat_manager_refresh_noti(ctx, cp_name,
+                               (struct tel_sat_refresh_tlv *)&p_ind->proactive_ind_data.refresh);
                        if (!refresh) {
-                               dbg("no refresh data");
+                               dbg("NO Refresh data");
                                return TRUE;
                        }
 
-                       dbg("refresh type_format(%s)", g_variant_get_type_string(refresh));
-                       g_variant_get(refresh, "(ii@v)", &command_id, &refresh_type, &file_list);
+                       dbg("PROATV_CMD_REFRESH - type_format: [%s]",
+                               g_variant_get_type_string(refresh));
+
+                       g_variant_get(refresh, "(ii@v)", &command_id,
+                               &refresh_type, &file_list);
 
-                       telephony_sat_emit_refresh(sat, command_id, refresh_type, file_list);
-                       ret = sat_ui_support_launch_sat_ui(SAT_PROATV_CMD_REFRESH, refresh, slot_id);
+                       telephony_sat_emit_refresh(sat,
+                               command_id, refresh_type, file_list);
+
+                       ret = sat_ui_support_launch_sat_ui(SAT_PROATV_CMD_REFRESH,
+                               refresh, slot_id);
                        if (!ret) {
                                int rv;
-                               dbg("fail to launch sat-ui, remove the queued data!!\n");
+
+                               err("Failed to launch 'sat-ui', remove the queued data!!!");
+
                                if (!sat_manager_handle_sat_ui_launch_fail(ctx, cp_name, p_ind))
-                                       dbg("Fail to send terminal response\n");
+                                       dbg("Failed to send Terminal Response!!!");
+
                                rv = sat_manager_remove_cmd_by_id(ctx, command_id);
                                if (!rv)
-                                       dbg("fail to dequeue data\n");
+                                       dbg("Failed to de-queue data\n");
                        }
-                       } break;
+               }
+               break;
 
                case SAT_PROATV_CMD_MORE_TIME: {
-                       sat_manager_more_time_noti(ctx, cp_name, (struct tel_sat_more_time_tlv*) &p_ind->proactive_ind_data.more_time);
+                       dbg("PROATV_CMD_MORE_TIME");
+
+                       sat_manager_more_time_noti(ctx, cp_name,
+                               (struct tel_sat_more_time_tlv *)&p_ind->proactive_ind_data.more_time);
+
                        telephony_sat_emit_more_time(sat);
-                       } break;
+               }
+               break;
 
                case SAT_PROATV_CMD_SEND_DTMF: {
                        GVariant *send_dtmf = NULL;
@@ -1380,49 +1704,70 @@ gboolean dbus_plugin_sat_notification(struct custom_data *ctx, CoreObject *sourc
 #if defined(TIZEN_SUPPORT_SAT_ICON)
                        GVariant *icon_id = NULL;
 #endif
-                       send_dtmf = sat_manager_send_dtmf_noti(ctx, cp_name, (struct tel_sat_send_dtmf_tlv*) &p_ind->proactive_ind_data.send_dtmf);
+
+                       send_dtmf = sat_manager_send_dtmf_noti(ctx, cp_name,
+                               (struct tel_sat_send_dtmf_tlv *)&p_ind->proactive_ind_data.send_dtmf);
                        if (!send_dtmf) {
-                               dbg("no send_dtmf data");
+                               dbg("NO Send DTMF data");
                                return TRUE;
                        }
 
-                       dbg("send_dtmf type_format(%s)", g_variant_get_type_string(send_dtmf));
+                       dbg("PROATV_CMD_SEND_DTMF - type_format: [%s]",
+                               g_variant_get_type_string(send_dtmf));
+
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                       g_variant_get(send_dtmf, "(isi@vis)", &command_id, &text, &text_len, &icon_id, &dtmf_str_len, &dtmf_str);
+                       g_variant_get(send_dtmf, "(isi@vis)", &command_id,
+                               &text, &text_len, &icon_id, &dtmf_str_len, &dtmf_str);
 #else
-                       g_variant_get(send_dtmf, "(isiis)", &command_id, &text, &text_len, &dtmf_str_len, &dtmf_str);
+                       g_variant_get(send_dtmf, "(isiis)", &command_id,
+                               &text, &text_len, &dtmf_str_len, &dtmf_str);
 #endif
+
                        if (text_len > 1 && (g_strcmp0(text, "") != 0)) {
                                GVariant *ui_info = NULL;
                                gboolean user_confirm = FALSE;
                                int ret;
-                               dbg("text should be displayed by ui");
-                               dbg("send dtmf is displayed!!!");
+
+                               dbg("Text should be displayed by UI - Send DTMF is displayed!!!");
+
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                               ui_info = g_variant_new("(isibv)", command_id, text, text_len, user_confirm, icon_id);
+                               ui_info = g_variant_new("(isibv)", command_id,
+                                       text, text_len, user_confirm, icon_id);
 #else
-                               ui_info = g_variant_new("(isib)", command_id, text, text_len, user_confirm);
+                               ui_info = g_variant_new("(isib)", command_id,
+                                       text, text_len, user_confirm);
 #endif
-                               ret = sat_ui_support_launch_sat_ui(SAT_PROATV_CMD_SEND_DTMF, ui_info, slot_id);
+
+                               ret = sat_ui_support_launch_sat_ui(SAT_PROATV_CMD_SEND_DTMF,
+                                       ui_info, slot_id);
                                if (!ret) {
                                        int rv;
-                                       dbg("fail to launch sat-ui, remove the queued data!!\n");
+
+                                       err("Failed to launch 'sat-ui', remove the queued data!!!");
+
                                        if (!sat_manager_handle_sat_ui_launch_fail(ctx, cp_name, p_ind))
-                                               dbg("Fail to send terminal response\n");
+                                               dbg("Failed to send Terminal Response!!!");
+
                                        rv = sat_manager_remove_cmd_by_id(ctx, command_id);
                                        if (!rv)
-                                               dbg("fail to dequeue data\n");
+                                               dbg("Failed to de-queue data\n");
                                }
+
                                g_free(text);
                                g_free(dtmf_str);
+
                                return TRUE;
                        }
+
 #if !defined(TIZEN_PLATFORM_USE_QCOM_QMI)
-                       telephony_sat_emit_send_dtmf(sat, command_id, text, text_len, dtmf_str, dtmf_str_len);
+                       telephony_sat_emit_send_dtmf(sat,
+                               command_id, text, text_len, dtmf_str, dtmf_str_len);
 #endif
+
                        g_free(text);
                        g_free(dtmf_str);
-                       } break;
+               }
+               break;
 
                case SAT_PROATV_CMD_LAUNCH_BROWSER: {
                        GVariant *launch_browser = NULL;
@@ -1435,62 +1780,90 @@ gboolean dbus_plugin_sat_notification(struct custom_data *ctx, CoreObject *sourc
 #if defined(TIZEN_SUPPORT_SAT_ICON)
                        GVariant *icon_id = NULL;
 #endif
-                       launch_browser = sat_manager_launch_browser_noti(ctx, cp_name, (struct tel_sat_launch_browser_tlv*) &p_ind->proactive_ind_data.launch_browser);
+
+                       launch_browser = sat_manager_launch_browser_noti(ctx, cp_name,
+                               (struct tel_sat_launch_browser_tlv *)&p_ind->proactive_ind_data.launch_browser);
                        if (!launch_browser) {
-                               dbg("no launch_browser data");
+                               dbg("NO launch Browser data");
                                return TRUE;
                        }
 
-                       dbg("launch_browser type_format(%s)", g_variant_get_type_string(launch_browser));
+                       dbg("PROATV_CMD_LAUNCH_BROWSER - type_format: [%s]",
+                               g_variant_get_type_string(launch_browser));
+
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                       g_variant_get(launch_browser, "(iiisisisi@v)", &command_id, &browser_launch_type, &browser_id, &url, &url_len, &gateway_proxy, &gateway_proxy_len, &text, &text_len, &icon_id);
+                       g_variant_get(launch_browser, "(iiisisisi@v)", &command_id,
+                               &browser_launch_type, &browser_id, &url, &url_len,
+                               &gateway_proxy, &gateway_proxy_len,
+                               &text, &text_len, &icon_id);
 #else
-                       g_variant_get(launch_browser, "(iiisisisi)", &command_id, &browser_launch_type, &browser_id, &url, &url_len, &gateway_proxy, &gateway_proxy_len, &text, &text_len);
+                       g_variant_get(launch_browser, "(iiisisisi)", &command_id,
+                               &browser_launch_type, &browser_id, &url, &url_len,
+                               &gateway_proxy, &gateway_proxy_len,
+                               &text, &text_len);
 #endif
-                       /* Popup is mendatory option in browser case */
+
+                       /*
+                        * Pop-up is MANDATORY option in Browser case
+                        */
                        {
                                GVariant *ui_info = NULL;
                                gboolean user_confirm = TRUE;
                                int ret;
-                               dbg("text should be displayed by ui");
-                               dbg("launch browser is displayed!!!");
+
+                               dbg("Text should be displayed by UI - Launch Browser is displayed!!!");
+
 #if defined(TIZEN_SUPPORT_SAT_ICON)
-                               ui_info = g_variant_new("(isibv)", command_id, text, text_len, user_confirm, icon_id);
+                               ui_info = g_variant_new("(isibv)", command_id,
+                                       text, text_len, user_confirm, icon_id);
 #else
-                               ui_info = g_variant_new("(isib)", command_id, text, text_len, user_confirm);
+                               ui_info = g_variant_new("(isib)", command_id,
+                                       text, text_len, user_confirm);
 #endif
-                               ret = sat_ui_support_launch_sat_ui(SAT_PROATV_CMD_LAUNCH_BROWSER, ui_info, slot_id);
+
+                               ret = sat_ui_support_launch_sat_ui(SAT_PROATV_CMD_LAUNCH_BROWSER,
+                                       ui_info, slot_id);
                                if (!ret) {
                                        int rv;
-                                       dbg("fail to launch sat-ui, remove the queued data!!\n");
+
+                                       err("Failed to launch 'sat-ui', remove the queued data!!!");
+
                                        if (!sat_manager_handle_sat_ui_launch_fail(ctx, cp_name, p_ind))
-                                               dbg("Fail to send terminal response\n");
+                                               dbg("Failed to send Terminal Response!!!");
+
                                        rv = sat_manager_remove_cmd_by_id(ctx, command_id);
                                        if (!rv)
-                                               dbg("fail to dequeue data\n");
+                                               dbg("Failed to de-queue data\n");
                                }
+
                                g_free(url);
                                g_free(text);
                                g_free(gateway_proxy);
+
                                return TRUE;
                        }
-                       } break;
+               }
+               break;
 
                case SAT_PROATV_CMD_PROVIDE_LOCAL_INFO: {
                        GVariant *provide_info = NULL;
                        gint info_type = 0;
 
-                       provide_info = sat_manager_provide_local_info_noti(ctx, cp_name, (struct tel_sat_provide_local_info_tlv*) &p_ind->proactive_ind_data.provide_local_info);
+                       provide_info = sat_manager_provide_local_info_noti(ctx, cp_name,
+                               (struct tel_sat_provide_local_info_tlv *)&p_ind->proactive_ind_data.provide_local_info);
                        if (!provide_info) {
-                               dbg("no provide_info data");
+                               dbg("NO Provide info data");
                                return TRUE;
                        }
 
-                       dbg("provide_info type_format(%s)", g_variant_get_type_string(provide_info));
+                       dbg("PROATV_CMD_PROVIDE_LOCAL_INFO - type_format: [%s]",
+                               g_variant_get_type_string(provide_info));
+
                        g_variant_get(provide_info, "(i)", &info_type);
 
                        telephony_sat_emit_provide_local_info(sat, info_type);
-                       } break;
+               }
+               break;
 
                case SAT_PROATV_CMD_LANGUAGE_NOTIFICATION: {
                        GVariant *language_noti = NULL;
@@ -1498,30 +1871,42 @@ gboolean dbus_plugin_sat_notification(struct custom_data *ctx, CoreObject *sourc
                        gint language = 0;
                        gboolean b_specified = FALSE;
 
-                       language_noti = sat_manager_language_notification_noti(ctx, cp_name, (struct tel_sat_language_notification_tlv*) &p_ind->proactive_ind_data.language_notification);
+                       language_noti = sat_manager_language_notification_noti(ctx, cp_name,
+                               (struct tel_sat_language_notification_tlv *)&p_ind->proactive_ind_data.language_notification);
                        if (!language_noti) {
-                               dbg("no language_noti data");
+                               dbg("NO Language noti data");
                                return TRUE;
                        }
 
-                       dbg("language_noti type_format(%s)", g_variant_get_type_string(language_noti));
-                       g_variant_get(language_noti, "(iib)", &command_id, &language, &b_specified);
+                       dbg("PROATV_CMD_LANGUAGE_NOTIFICATION - type_format: [%s]",
+                               g_variant_get_type_string(language_noti));
+
+                       g_variant_get(language_noti, "(iib)", &command_id,
+                               &language, &b_specified);
 
                        sat_manager_update_language(ctx, cp_name, language_noti);
 
-                       telephony_sat_emit_language_notification(sat, command_id, language, b_specified);
-                       } break;
+                       telephony_sat_emit_language_notification(sat,
+                               command_id, language, b_specified);
+               }
+               break;
 
-               default:{
+               default: {
                        gboolean rv = FALSE;
-                       rv = sat_manager_processing_unsupport_proactive_command(ctx, cp_name, (struct tel_sat_unsupproted_command_tlv*) &p_ind->proactive_ind_data.unsupport_cmd);
-                       dbg("not handled ind->cmd_type[0x%x] send error tr result(%d)", p_ind->cmd_type, rv);
-                       } break;
+
+                       rv = sat_manager_processing_unsupport_proactive_command(ctx, cp_name,
+                               (struct tel_sat_unsupproted_command_tlv *)&p_ind->proactive_ind_data.unsupport_cmd);
+
+                       err("Unhandled/Unknown Command type: [0x%x] - Send error TR Result: [%d]", p_ind->cmd_type, rv);
                }
-               } break;
-       default:
-               err("Unhandled Notification: [0x%x]", command);
                break;
+               }
+       }
+       break;
+
+       default:
+               err("Unhandled/Unknown Notification: [0x%x]", command);
+       break;
        }
 
        return TRUE;