Migration from wearable #1

 - fix some coding rule error
 - add to check sim process error
 - add to check modem count on bootup

Change-Id: I018390ca1c53f8bbf461d21e10c70b71b4f74066
Signed-off-by: sinikang <sinikang@samsung.com>

diff --git a/include/manager_core.h b/include/manager_core.h
index ff4c90d47ae9bbcac7035a9df20964f68e113850..321ce5b06089d3a365357ade6f82d8fc3d5d4fd3 100644 (file)
--- a/include/manager_core.h
+++ b/include/manager_core.h
@@ -45,6 +45,7 @@ typedef struct {
 } ModemBoard;
 
 ModemBoard *    manager_core_get_modem_board(Manager *manager, TcorePlugin *modem_plugin);
+ModemBoard *    manager_core_get_modem_board_by_plugin(TcorePlugin *modem_plugin);
 ModemBoardIndex manager_core_get_modem_board_index(TcorePlugin *modem_plugin);
 
 void manager_core_create_modem_board(TcorePlugin *manager_plugin, TcorePlugin *modem_plugin);

diff --git a/include/manager_modem.h b/include/manager_modem.h
index c2bb5ed5c20b9f48cbbb088f1c4cf0a8f579916b..f91b8683a219c41163f7b00a9a27c072529f6c17 100644 (file)
--- a/include/manager_modem.h
+++ b/include/manager_modem.h
@@ -42,8 +42,7 @@ struct manager_modem_private_info {
 };
 
 gboolean manager_modem_initialize_private_info(ModemBoard *mb);
-gboolean manager_modem_clear_private_info(ModemBoard *mb);
-
+void manager_modem_clear_private_info(ModemBoard *mb);
 
 enum tcore_manager_return manager_modem_process_request(Server *server,
                                                        UserRequest *ur);

diff --git a/include/manager_phonebook.h b/include/manager_phonebook.h
index d2f8d6dd285400a8c980bff58eb81434f8543eb1..597baec7cb1a7ad87c31cfc59851d4a0cb0a2393 100644 (file)
--- a/include/manager_phonebook.h
+++ b/include/manager_phonebook.h
@@ -25,7 +25,7 @@
 extern "C" {
 #endif
 
-enum tcore_manager_return manager_phonebook_process_request(Server* server, UserRequest* ur);
+enum tcore_manager_return manager_phonebook_process_request(Server *server, UserRequest *ur);
 #ifdef __cplusplus
 }
 #endif

diff --git a/include/manager_sim.h b/include/manager_sim.h
index 4ff40af08de21a4e2f71b9583bc710ef9aba773a..ec8e54c2264172e8da1323552e6443e33fb6176f 100644 (file)
--- a/include/manager_sim.h
+++ b/include/manager_sim.h
@@ -48,7 +48,9 @@ void manager_network_resp_hook_set_ds(UserRequest *ur,
 
 
 gboolean manager_sim_initialize_private_info(ModemBoard *mb);
-void set_nw_dds_ds_on_boot(Manager *manager);
+void     manager_sim_process_modem_error(CoreObject *co_modem);
+
+void     set_nw_dds_ds_on_boot(Manager *manager);
 
 #ifdef __cplusplus
 }

diff --git a/include/manager_sms.h b/include/manager_sms.h
index 14779b72d8626f9115a920beb1ee6863fd64ecf9..3153e5dea8d09d955bca1e56aa92df6d0a786075 100644 (file)
--- a/include/manager_sms.h
+++ b/include/manager_sms.h
@@ -29,7 +29,6 @@ enum tcore_manager_return manager_sms_process_request(Server *server, UserReques
 enum tcore_manager_return manager_sms_process_notification(Manager *manager,
                                                           CoreObject *source, enum tcore_notification_command command,
                                                           unsigned int data_len, void *data);
-
 #ifdef __cplusplus
 }
 #endif

diff --git a/include/manager_util.h b/include/manager_util.h
index 35e690ac0f856b91620b27fa342d7f33805e46fa..7c2d4d1170df026368e85ebb37f2d7aac8688c5d 100644 (file)
--- a/include/manager_util.h
+++ b/include/manager_util.h
@@ -30,7 +30,7 @@ extern "C" {
 TcorePlugin *manager_util_get_modem_plugin(Server *server, UserRequest *ur);
 TcorePlugin *manager_util_get_modem_plugin_by_subs_type(Server *server,
        enum telephony_subscription_type subs_type);
-CoreObject * manager_util_get_core_object(Server *server, UserRequest *ur, unsigned int type);
+CoreObject *manager_util_get_core_object(Server *server, UserRequest *ur, unsigned int type);
 
 gboolean                                    manager_util_is_ims_registered(Server *server, UserRequest *ur, guint feature_type);
 enum telephony_network_ims_reg_network_type manager_util_get_ims_reg_network_type(Server *server, UserRequest *ur);
@@ -39,6 +39,7 @@ gboolean manager_util_send_request(TcorePlugin *modem_plugin, enum tcore_request
                                   unsigned int data_len, const void *data, UserRequestResponseHook resp_hook, void *user_data);
 
 TcorePlugin *             manager_util_get_other_subs_plugin(TcorePlugin *plugin);
+gint                      manager_util_get_modem_count(Manager *manager);
 void                      manager_set_deregister_timer(Manager *manager, guint timer_id);
 void                      manager_clear_deregister_timer(Manager *manager);
 guint                     manager_get_deregister_timer(Manager *manager);

diff --git a/packaging/tel-plugin-manager.spec b/packaging/tel-plugin-manager.spec
index c1eb3359c89f4bab6f2e76985bf5a05835174d3d..e13362ee03abd23fa00608d2b6e9ca1bd7a6d8cb 100644 (file)
--- a/packaging/tel-plugin-manager.spec
+++ b/packaging/tel-plugin-manager.spec
@@ -1,6 +1,6 @@
 %define major 0
 %define minor 1
-%define patchlevel 17
+%define patchlevel 18
 
 Name:           tel-plugin-manager
 Version:        %{major}.%{minor}.%{patchlevel}

diff --git a/src/manager_call.c b/src/manager_call.c
index 3c7c1477386af60f521eb28c063cb9477c721d11..46172889642eba116092cf2b4eb58e5451c264c2 100644 (file)
--- a/src/manager_call.c
+++ b/src/manager_call.c
@@ -460,7 +460,7 @@ static void on_resp_manager_set_ecc_status(UserRequest *ur,
 
        if (resp_data->result == TCORE_RETURN_SUCCESS) {
                UserRequest *ur_cpy;
-               struct tnoti_call_status_dialing noti_data = {0,};
+               struct tnoti_call_status_dialing noti_data = { 0, };
                Manager *manager = tcore_server_ref_manager(server);
                TcorePlugin *manager_plugin = tcore_manager_get_plugin(manager);
                PrivateData *priv_data = tcore_plugin_ref_user_data(manager_plugin);
@@ -1286,7 +1286,7 @@ enum tcore_manager_return manager_call_process_request(Server *server, UserReque
        case TREQ_CALL_SET_PREFERRED_VOICE_SUBSCRIPTION: {
 
                dbg("adding hook to update DS to db");
-                       /* Set Response hook */
+               /* Set Response hook */
                tcore_user_request_set_response_hook(ur, manager_network_resp_hook_set_ds, server);
        }
        break;
@@ -1439,7 +1439,7 @@ enum tcore_manager_return manager_call_process_notification(Manager *manager, Co
                /*
                 * Check if Network Search is in progress and cancel the same
                 */
-               if (ret !=  TCORE_MANAGER_RETURN_STOP) {
+               if (ret != TCORE_MANAGER_RETURN_STOP) {
                        info("Cancel any on-going Network Search");
                        manager_network_cancel_network_search(manager, tcore_plugin_ref_server(plugin_subs));
                }
@@ -1461,7 +1461,7 @@ enum tcore_manager_return manager_call_process_notification(Manager *manager, Co
                call_handle = idle_noti->handle;
                cpi = mb->call_info;
 
-               /* Unsetting is_dial_initiated flag on rececipt of dial notification */
+               /* Unsetting is_dial_initiated flag on rececipt of idle notification */
                priv_data->is_dial_initiated = FALSE;
 
                if ((cpi->rat_query_cache.call_handle == call_handle) &&

diff --git a/src/manager_core.c b/src/manager_core.c
index 7310b064c4084a2b8725d266a4bf42d2a5842ab3..97a22ab223028964e033a0ee3c1f7cfb3b2c9e3c 100644 (file)
--- a/src/manager_core.c
+++ b/src/manager_core.c
@@ -30,9 +30,9 @@
 #include "manager_queue.h"
 #include "manager_network.h"
 #include "manager_sim.h"
-#include "internal/manager_internal.h"
 #include "manager_call.h"
 #include "manager_modem.h"
+#include "internal/manager_internal.h"
 
 static void __create_modem_board_sub_modules(ModemBoard *mb)
 {
@@ -144,9 +144,18 @@ ModemBoard *manager_core_get_modem_board(Manager *manager, TcorePlugin *modem_pl
                        return mb;
                }
        }
+       warn("Cannot find modem board");
        return NULL;
 }
 
+ModemBoard *manager_core_get_modem_board_by_plugin(TcorePlugin *modem_plugin)
+{
+       Server *server = tcore_plugin_ref_server(modem_plugin);
+       Manager *manager = tcore_server_ref_manager(server);
+
+       return manager_core_get_modem_board(manager, modem_plugin);
+}
+
 ModemBoardIndex manager_core_get_modem_board_index(TcorePlugin *modem_plugin)
 {
        const char *cp_name = tcore_server_get_cp_name_by_plugin(modem_plugin);

diff --git a/src/manager_modem.c b/src/manager_modem.c
index 5718b30f0237ebcd62fd2a6e0a748adc63310860..e2f1962742eab0e2e47208aa664eec7c8e3d9480 100644 (file)
--- a/src/manager_modem.c
+++ b/src/manager_modem.c
@@ -129,7 +129,7 @@ static enum tcore_manager_return __handle_flight_mode_end(Server *server, UserRe
                        co_call = co_call_other;
                        plugin_subs = plugin_subs_other;
                }
-       } else{
+       } else {
                priv_data->is_end_all_initiated = FALSE;
        }
 
@@ -145,7 +145,7 @@ static enum tcore_manager_return __handle_flight_mode_end(Server *server, UserRe
                tcore_user_request_set_command(new_ur, TREQ_CALL_END);
                tcore_user_request_set_data(new_ur, sizeof(struct treq_call_end), &req);
                if (TCORE_RETURN_SUCCESS != tcore_server_dispatch_request(server, new_ur)) {
-                       err("END_ALL request failed!!r");
+                       err("END_ALL request failed!!");
                        tcore_user_request_free(new_ur);
                } else {
                        info("queueing flight mode request");
@@ -155,8 +155,8 @@ static enum tcore_manager_return __handle_flight_mode_end(Server *server, UserRe
        }
 
        return TCORE_MANAGER_RETURN_CONTINUE;
-
 }
+
 enum tcore_manager_return manager_modem_process_request(Server *server,
                                                        UserRequest *ur)
 {
@@ -511,14 +511,14 @@ gboolean manager_modem_initialize_private_info(ModemBoard *mb)
        return TRUE;
 }
 
-gboolean manager_modem_clear_private_info(ModemBoard *mb)
+void manager_modem_clear_private_info(ModemBoard *mb)
 {
 
        dbg("enter");
 
        if (G_UNLIKELY(!mb || !mb->modem_info)) {
                err("Invalid data");
-               return FALSE;
+               return;
        }
 
        if (mb->index == MANAGER_MODEM_BOARD_INDEX_0) {
@@ -530,8 +530,6 @@ gboolean manager_modem_clear_private_info(ModemBoard *mb)
        mb->modem_info = NULL;
 
        dbg("done");
-
-       return TRUE;
 }
 
 enum tcore_manager_return manager_modem_process_notification(Manager *manager,
@@ -554,11 +552,15 @@ enum tcore_manager_return manager_modem_process_notification(Manager *manager,
                const struct tnoti_modem_power *modem_power = data;
 
                switch (modem_power->state) {
-               case MODEM_STATE_ERROR:
+               case MODEM_STATE_ERROR: {
                        dbg("Modem RESET happened");
+
                        manager_network_process_modem_error(source);
                        manager_call_process_modem_error(source);
+                       manager_sim_process_modem_error(source);
+
                        priv_data->fm_processing_state = MANAGER_FLIGHT_PROCESSING_NONE;
+               }
                        break;
 
                case MODEM_STATE_ONLINE: {
@@ -578,7 +580,7 @@ enum tcore_manager_return manager_modem_process_notification(Manager *manager,
                                }
                        }
                }
-               break;
+                       break;
 
                case MODEM_STATE_OFFLINE: {
                        dbg("MODEM_STATE has been changed to OFFLINE");
@@ -594,7 +596,7 @@ enum tcore_manager_return manager_modem_process_notification(Manager *manager,
                                }
                        }
                }
-               break;
+                       break;
 
                default:
                        break;
@@ -604,7 +606,7 @@ enum tcore_manager_return manager_modem_process_notification(Manager *manager,
                set_nw_dds_ds_on_boot(manager);
 #endif
        }
-       break;
+               break;
 
        default:
                break;

diff --git a/src/manager_notification.c b/src/manager_notification.c
index 022a291400e2183ecc1f4d29c2324780f3685822..09df5e75724662cce2ab40a4dac8ee64cf0f0350 100644 (file)
--- a/src/manager_notification.c
+++ b/src/manager_notification.c
@@ -44,45 +44,45 @@ enum tcore_manager_return manager_notification_handler(Manager *manager,
        case TCORE_TYPE_CALL:
                mret = manager_call_process_notification(manager,
                        source, command, data_len, data);
-       break;
+               break;
 
        case TCORE_TYPE_MODEM:
                mret = manager_modem_process_notification(manager,
                        source, command, data_len, data);
-       break;
+               break;
 
        case TCORE_TYPE_NETWORK:
                mret = manager_network_process_notification(manager,
                        source, command, data_len, data);
-       break;
+               break;
 
        case TCORE_TYPE_SIM:
                mret = manager_sim_process_notification(manager,
                        source, command, data_len, data);
-       break;
+               break;
 
        case TCORE_TYPE_SERVER:
                mret = manager_server_process_notification(manager,
                        source, command, data_len, data);
-       break;
+               break;
 
        case TCORE_TYPE_SMS:
                mret = manager_sms_process_notification(manager,
                        source, command, data_len, data);
-       break;
+               break;
 
        default:
                return TCORE_MANAGER_RETURN_CONTINUE;
        }
 
        if (mret == TCORE_MANAGER_RETURN_STOP)
-               dbg("module:[0x%x] ret:[STOP]");
+               dbg("module:[0x%x] ret:[STOP]", module);
        else if (mret == TCORE_MANAGER_RETURN_CONTINUE)
-               dbg("module:[0x%x] ret:[CONTINUE]");
+               dbg("module:[0x%x] ret:[CONTINUE], module");
        else if (mret == TCORE_MANAGER_RETURN_CONTINUE_IMS)
-               dbg("module:[0x%x] ret:[IMS]");
+               dbg("module:[0x%x] ret:[IMS]", module);
        else
-               dbg("module:[0x%x] ret:[FAIL]");
+               err("module:[0x%x] ret:[FAIL]", module);
 
        return mret;
 }

diff --git a/src/manager_phonebook.c b/src/manager_phonebook.c
index 06fb220b71daf8f7e266f95b104197deeef8bb98..450a114a55fa44c42cc9af4c0575276f060257e0 100644 (file)
--- a/src/manager_phonebook.c
+++ b/src/manager_phonebook.c
@@ -47,7 +47,7 @@ static void __on_hook_change_pb_record(UserRequest *ur, enum tcore_response_comm
        }
 
        if (TRESP_PHONEBOOK_UPDATERECORD == command) {
-               struct tresp_phonebook_update_record * update_record_resp = (struct tresp_phonebook_update_record *)data;
+               struct tresp_phonebook_update_record *update_record_resp = (struct tresp_phonebook_update_record *)data;
 
                if (update_record_resp && PB_SUCCESS == update_record_resp->result) {
                        struct treq_phonebook_update_record *update_record_req = (struct treq_phonebook_update_record *)tcore_user_request_ref_data(ur, NULL);
@@ -69,7 +69,7 @@ static void __on_hook_change_pb_record(UserRequest *ur, enum tcore_response_comm
 
                        g_hash_table_iter_init(&iter, mb->fdn_contacts);
                        while (g_hash_table_iter_next(&iter, &key, &value) == TRUE) {
-                               index = atoi((const char *) value);
+                               index = atoi((const char *)value);
                                if (index == delete_record_req->index) { /* valid index of FDN record deleted*/
                                        info("Deleted record index found, remove it from cache : index[%d] number[%s]", index, key);
                                        g_hash_table_remove(mb->fdn_contacts, key);
@@ -83,7 +83,7 @@ static void __on_hook_change_pb_record(UserRequest *ur, enum tcore_response_comm
        }
 }
 
-enum tcore_manager_return manager_phonebook_process_request(Server* server, UserRequest* ur)
+enum tcore_manager_return manager_phonebook_process_request(Server *server, UserRequest *ur)
 {
        enum tcore_request_command command = tcore_user_request_get_command(ur);
        enum tcore_manager_return manager_ret = TCORE_MANAGER_RETURN_CONTINUE;
@@ -100,7 +100,8 @@ enum tcore_manager_return manager_phonebook_process_request(Server* server, User
                        tcore_user_request_set_response_hook(ur, __on_hook_change_pb_record, server);
                }
        }
-       break;
+               break;
+
        case TREQ_PHONEBOOK_DELETERECORD: {
                struct treq_phonebook_delete_record *delete_record_req = (struct treq_phonebook_delete_record *)tcore_user_request_ref_data(ur, NULL);
 
@@ -109,11 +110,13 @@ enum tcore_manager_return manager_phonebook_process_request(Server* server, User
                        tcore_user_request_set_response_hook(ur, __on_hook_change_pb_record, server);
                }
        }
+               break;
+
        /*
         * All other requests, would be routed to CP.
         */
        default:
-       break;
+               break;
        }
 
        return manager_ret;

diff --git a/src/manager_request.c b/src/manager_request.c
index 12c02e689a135c7d784c76c18372aefe36f445a2..45defb99ef825aa3dd47fe727ce760341bec1b99 100644 (file)
--- a/src/manager_request.c
+++ b/src/manager_request.c
@@ -64,10 +64,12 @@ enum tcore_manager_return manager_request_handler(Manager *manager, UserRequest
 
        case TCORE_TYPE_SIM:
                mret = manager_sim_process_request(server, ur);
-       break;
+               break;
+
        case TCORE_TYPE_PHONEBOOK:
                mret = manager_phonebook_process_request(server, ur);
-       break;
+               break;
+
        /*
         * All other modules, would be routed to CP.
         * Need to handle other modules as well
@@ -76,12 +78,14 @@ enum tcore_manager_return manager_request_handler(Manager *manager, UserRequest
                return TCORE_MANAGER_RETURN_CONTINUE;
        }
 
-       dbg("Command:[0x%x] mret:[%s]", command,
+       if (mret == TCORE_MANAGER_RETURN_CONTINUE)
+               return mret;
+
+       info("Command:[0x%x] mret:[%s]", command,
            (mret == TCORE_MANAGER_RETURN_FAILURE ? "FALIURE" :
             (mret == TCORE_MANAGER_RETURN_STOP ? "STOP" :
-             (mret == TCORE_MANAGER_RETURN_CONTINUE ? "TO MODEM" :
               (mret == TCORE_MANAGER_RETURN_CONTINUE_IMS ? "TO IMS" :
-                   "UNKNOWN RESULT")))));
+                   "UNKNOWN"))));
 
        return mret;
 }

diff --git a/src/manager_sim.c b/src/manager_sim.c
index 350aafc55bc8f7f2310e05bd3e93a7246af7ae6a..0ac6cc7955aa3cff6b83a7281f642b39939fe34b 100644 (file)
--- a/src/manager_sim.c
+++ b/src/manager_sim.c
@@ -1370,6 +1370,9 @@ static enum tcore_hook_return on_noti_hook_manager_call_status_idle(Server *serv
 
 void set_nw_dds_ds_on_boot(Manager *manager)
 {
+       if (manager_util_get_modem_count(manager) <= 1)
+               return;
+
        if (__are_both_sims_ready_after_boot(manager)) {
                Server *server = tcore_plugin_ref_server(tcore_manager_get_plugin(manager));
                GSList *modem_plugin_list = tcore_server_get_modem_plugin_list(server);
@@ -1394,6 +1397,18 @@ void set_nw_dds_ds_on_boot(Manager *manager)
                g_slist_free(modem_plugin_list);
        }
 }
+
+void manager_sim_process_modem_error(CoreObject *co_modem)
+{
+       TcorePlugin *plugin = tcore_object_ref_plugin(co_modem);
+       ModemBoard *mb = manager_core_get_modem_board_by_plugin(plugin);
+
+       if (mb && mb->sim_info) {
+               info("Initialize first boot info");
+               mb->sim_info->is_first_boot = TRUE;
+       }
+}
+
 enum tcore_manager_return manager_sim_process_notification(Manager *manager,
                                                           CoreObject *source, enum tcore_notification_command command,
                                                           unsigned int data_len, void *data)

diff --git a/src/manager_sms.c b/src/manager_sms.c
index 27d94c8a6d6375ad9e9f494307ee23a270e960ca..be199c2e320021d08678e31e7126f2a56ec38ee4 100644 (file)
--- a/src/manager_sms.c
+++ b/src/manager_sms.c
@@ -41,9 +41,9 @@
 
 /** BER-TLV tag for SMS-PP download. TS 31.111 section 9.1. */
 #define BER_SMS_PP_DOWNLOAD_TAG 0xd1
-#define COMPREHENSION_TLV_TAG_DEVICE_IDENTITIES (0x80|0x02)
+#define COMPREHENSION_TLV_TAG_DEVICE_IDENTITIES (0x80 | 0x02)
 #define COMPREHENSION_TLV_TAG_ADDRESS 0x06
-#define COMPREHENSION_TLV_TAG_SMS_TPDU (0x80|0x0b)
+#define COMPREHENSION_TLV_TAG_SMS_TPDU (0x80 | 0x0b)
 
 struct manager_sms_decoded_param {
        unsigned char dcs;
@@ -327,7 +327,6 @@ static void __sms_on_resp_apdu(UserRequest *ur, enum tcore_response_command comm
                               unsigned int data_len, const void *data, void *user_data)
 {
        const struct tresp_sat_envelop_data *resp = data;
-
        if (G_UNLIKELY(!data))
                return;
 
@@ -381,8 +380,8 @@ static void __send_smspp_envelop_cmd(TcorePlugin *modem_plugin, struct tnoti_sms
                envelope.envelop_data.event_download.sms_pp.data[index++] = COMPREHENSION_TLV_TAG_ADDRESS;
                envelope.envelop_data.event_download.sms_pp.data[index++] = sca_len;
                envelope.envelop_data.event_download.sms_pp.data[index++] = ton;
-               memcpy(&envelope.envelop_data.event_download.sms_pp.data[index], sca, sca_len-1);
-               index += sca_len-1;
+               memcpy(&envelope.envelop_data.event_download.sms_pp.data[index], sca, sca_len - 1);
+               index += sca_len - 1;
        }
 
        /* SMS TPDU TLV. Length is assumed to be < 256 bytes. */
@@ -438,7 +437,7 @@ static void __sms_on_resp_get_sca_for_envelop(UserRequest *ur, enum tcore_respon
                ton = 0x80 + (resp->scaAddress.typeOfNum << 4) + resp->scaAddress.numPlanId;
 
                /* Send ENVELOPE_CMD to SIM */
-               __send_smspp_envelop_cmd(rp_data->modem_plugin, rp_data->msg_data, resp->scaAddress.dialNumLen+1, (unsigned char *)resp->scaAddress.diallingNum, ton, rp_data->dcs, rp_data->pid);
+               __send_smspp_envelop_cmd(rp_data->modem_plugin, rp_data->msg_data, resp->scaAddress.dialNumLen + 1, (unsigned char *)resp->scaAddress.diallingNum, ton, rp_data->dcs, rp_data->pid);
        } else {
                warn("Fail to Get SCA address(0x%x)", resp->result);
        }
@@ -588,7 +587,6 @@ enum tcore_manager_return manager_sms_process_request(Server *server, UserReques
        return TCORE_MANAGER_RETURN_CONTINUE;
 }
 
-
 enum tcore_manager_return manager_sms_process_notification(Manager *manager,
                                                           CoreObject *source, enum tcore_notification_command command,
                                                           unsigned int data_len, void *data)

diff --git a/src/manager_util.c b/src/manager_util.c
index 1e7bcf764fe27d4d68ef6ca806a4e4e4854c65e9..1688923150cb055d64bf9b812a535bed39cd2b09 100644 (file)
--- a/src/manager_util.c
+++ b/src/manager_util.c
@@ -20,6 +20,7 @@
 
 #include <stdio.h>
 #include <glib.h>
+
 #include <tcore.h>
 #include <server.h>
 #include <manager.h>
@@ -237,6 +238,9 @@ TcorePlugin *manager_util_get_other_subs_plugin(TcorePlugin *plugin)
        TcorePlugin *other_plugin = NULL;
        Server *s = tcore_plugin_ref_server(plugin);
 
+       if (tcore_server_get_modems_count(s) <= 1)
+               return NULL;
+
        modem_list = tcore_server_get_modem_plugin_list(s);
        if (!modem_list)
                return NULL;
@@ -254,7 +258,7 @@ TcorePlugin *manager_util_get_other_subs_plugin(TcorePlugin *plugin)
 
        g_slist_free(modem_list);
        if (is_found == TRUE) {
-               err("Current:[%p] Other:[%p]", plugin, other_plugin);
+               info("Current:[%p] Other:[%p]", plugin, other_plugin);
                return other_plugin;
        } else {
                err("other_sub_plugin not found.");
@@ -262,6 +266,16 @@ TcorePlugin *manager_util_get_other_subs_plugin(TcorePlugin *plugin)
        }
 }
 
+gint manager_util_get_modem_count(Manager *manager)
+{
+       TcorePlugin *plugin = tcore_manager_get_plugin(manager);
+       Server *s = tcore_plugin_ref_server(plugin);
+       if (G_UNLIKELY(!s))
+               return 0;
+
+       return tcore_server_get_modems_count(s);
+}
+
 gboolean manager_deregister_ims_timeout(gpointer user_data)
 {
        Manager *manager = user_data;
@@ -311,7 +325,6 @@ enum tcore_manager_return manager_util_process_ims(Server *server,
        Manager *manager = tcore_server_ref_manager(server);
        enum tcore_manager_return manager_ret = TCORE_MANAGER_RETURN_CONTINUE;
        enum tcore_request_command command = tcore_user_request_get_command(ur);
-
        int deregister_timeout = MANAGER_IMS_DEREGISTER_REQUEST_TIMEOUT;
 
        request_present = manager_queue_probe_command(manager,
@@ -323,7 +336,12 @@ enum tcore_manager_return manager_util_process_ims(Server *server,
                if (manager_get_deregister_timer(manager) != 0) {
                        /* Already requested for deregistration*/
                        dbg("Deregistration in progress, enqueue the request");
-                       /* Enqueue plmn selection mode request, process it once we get the de-registartion notification */
+
+                       /*
+                        * Enqueue plmn selection mode request,
+                        * process it once we get the
+                        * de-registartion notification
+                        */
                        manager_queue_enqueue(manager, ur);
                        return TCORE_MANAGER_RETURN_STOP;
                }

diff --git a/src/network_name/manager_network_name.h b/src/network_name/manager_network_name.h
index 20c47067d285f95d973d525e12aa4a8299d08bf6..6aaf119ad8f5a0f1d2353ab0495ef74d3e37a129 100644 (file)
--- a/src/network_name/manager_network_name.h
+++ b/src/network_name/manager_network_name.h
@@ -90,7 +90,7 @@ struct manager_network_eons_info {
        LacNetnameInfo *lac_netname_info;
 };
 
-void manager_network_process_sim_refreshed(CoreObject *co_sim);
+void     manager_network_process_sim_refreshed(CoreObject *co_sim);
 void     manager_network_get_sim_network_name(CoreObject *co_sim);
 void     manager_network_apply_operator_name_rule(const char *plmn, char **name_delta, char **name_long, char **name_short);
 void     manager_network_load_spn_override_info(NetworkPrivateInfo *npi);