[REFACTOR][setting-profile-common][setting-ringtone][setting-network] Porting to...

        Replacing cm_get_status() with telephony_call_get_status()

Change-Id: Ie205989b55203869bf1f39598182e0dcb2492cdd
Signed-off-by: Michal Skorupinski <m.skorupinsk@samsung.com>
Signed-off-by: Kiseok Chang <kiso.chang@samsung.com>

diff --git a/setting-network/CMakeLists.txt b/setting-network/CMakeLists.txt
index 99b51d08eb73d6c967474b7b1b6e8e2f70a86c7c..7f0d0fc29257f11c8d51599410c4339eb9bd77cb 100755 (executable)
--- a/setting-network/CMakeLists.txt
+++ b/setting-network/CMakeLists.txt
@@ -10,6 +10,7 @@ pkg_check_modules(pkgs_network REQUIRED
        capi-appfw-application
        capi-network-connection
        capi-system-system-settings
+       capi-telephony
        dlog
        efl-extension
        elementary

diff --git a/setting-network/include/setting-network.h b/setting-network/include/setting-network.h
index 738a1c00d5c3a31cb92d9ff33fe2ed74703be435..d4d539a8b7e86c01a7efc2e22f30dc23dd7150c1 100644 (file)
--- a/setting-network/include/setting-network.h
+++ b/setting-network/include/setting-network.h
@@ -240,4 +240,6 @@ bool setting_network_add_sim_toolbar(SettingNetwork *ad, Elm_Object_Item *page,
 void setting_network_mptcp_enable(void *data, bool enable);
 setting_network_mptcp_state_t setting_network_is_mptcp_enabled(void *data);
 
+bool is_call_status_idle(void);
+
 #endif                         /* __SETTING_NETWORK_H__ */

diff --git a/setting-network/src/setting-network-mode.c b/setting-network/src/setting-network-mode.c
index fb9cad9bf4153ea048d73c14738fddf8b22b6eef..8784382cf418bc7994f11ca82d83f743a64b4950 100755 (executable)
--- a/setting-network/src/setting-network-mode.c
+++ b/setting-network/src/setting-network-mode.c
@@ -19,8 +19,7 @@
  *
  */
 
-#include <call-manager.h>
-#include <setting-network.h>
+#include "setting-network.h"
 #include "setting-network-mode.h"
 
 static int _view_create(void *cb);
@@ -441,12 +440,8 @@ static void _fill_list(void)
        SETTING_TRACE_BEGIN;
        int value = 0;
        int err = 0;
-       cm_call_status_e call_status = CM_CALL_STATUS_IDLE;
-       cm_client_h cm_handle = NULL;
-       cm_init(&cm_handle);
-       cm_get_call_status(cm_handle, &call_status);
-       cm_deinit(cm_handle);
-       if (CM_CALL_STATUS_IDLE != call_status) {
+       bool is_idle = is_call_status_idle();
+       if (!is_idle) {
                setting_create_popup(s_info.ad, s_info.ad->md.window, NULL, _("IDS_CST_POP_OPERATION_NOT_ALLOWED_DURING_CALLS"), NULL, 0, false, false, 0);
                return;
        }

diff --git a/setting-network/src/setting-network-service-providers.c b/setting-network/src/setting-network-service-providers.c
index f4f5888da9e9b650c506a0fcf9d536c44c74b6aa..cdaaf836fc6d1efcea0b1669f824bd3e581c4789 100755 (executable)
--- a/setting-network/src/setting-network-service-providers.c
+++ b/setting-network/src/setting-network-service-providers.c
@@ -20,7 +20,6 @@
  *
  */
 
-#include <call-manager.h>
 #include "setting-network-service-providers.h"
 
 const char *STR_SETTING_OPERATION_FAILED = "IDS_BT_POP_OPERATION_FAILED";
@@ -126,12 +125,8 @@ void select_network_terminate(void)
 int select_network_show(SettingNetwork *ad)
 {
        SETTING_TRACE_BEGIN;
-       cm_call_status_e call_status = CM_CALL_STATUS_IDLE;
-       cm_client_h cm_handle = NULL;
-       cm_init(&cm_handle);
-       cm_get_call_status(cm_handle, &call_status);
-       cm_deinit(cm_handle);
-       if (CM_CALL_STATUS_IDLE != call_status) {
+       bool is_idle = is_call_status_idle();
+       if (!is_idle) {
                setting_create_popup(s_info.ad, s_info.ad->md.window, NULL, _("IDS_CST_POP_OPERATION_NOT_ALLOWED_DURING_CALLS"), NULL, 0, false, false, 0);
                return SETTING_GENERAL_ERR_NULL_DATA_PARAMETER;
        }

diff --git a/setting-network/src/setting-network.c b/setting-network/src/setting-network.c
index 7b171e14af6c0c77b184a63df6438aeeaf582b22..3b99a905e5ededade869c2a91065f71759cc92ae 100755 (executable)
--- a/setting-network/src/setting-network.c
+++ b/setting-network/src/setting-network.c
@@ -18,6 +18,8 @@
  * limitations under the License.
  *
  */
+
+#include <telephony/telephony.h>
 #include <setting-network.h>
 #include <setting-debug.h>
 #include <setting-cfg.h>
@@ -504,3 +506,59 @@ setting_network_mptcp_state_t setting_network_is_mptcp_enabled(void *data)
 
        return state ? SETTING_NETWORK_MPTCP_ENABLED : SETTING_NETWORK_MPTCP_DISABLED;
 }
+
+bool is_call_status_idle(void)
+{
+       unsigned int i = 0;
+       unsigned int j = 0;
+       unsigned int call_list_count = 0;
+       telephony_handle_list_s handle_list;
+       telephony_call_h *call_list;
+       telephony_call_status_e status = TELEPHONY_CALL_STATUS_IDLE;
+       bool to_return = true;
+
+
+       int err = telephony_init(&handle_list);
+       if (err != TELEPHONY_ERROR_NONE) {
+               SETTING_TRACE_ERROR("Function telephony_init() failed. Error: %s", get_error_message(err));
+               return false;
+       }
+
+       for (i = 0; i < handle_list.count; ++i) {
+               err = telephony_call_get_call_list(handle_list.handle[i], &call_list_count, &call_list);
+               if (err != TELEPHONY_ERROR_NONE) {
+                       SETTING_TRACE_ERROR("Function telephony_call_get_call_list() failed. Error: %s", get_error_message(err));
+                       continue;
+               }
+
+               for (j = 0; j < call_list_count; ++j) {
+                       err = telephony_call_get_status(call_list[j], &status);
+                       if (err != TELEPHONY_ERROR_NONE) {
+                               SETTING_TRACE_ERROR("Function telephony_call_get_status() failed. Error: %s", get_error_message(err));
+                               continue;
+                       }
+
+                       if (status != TELEPHONY_CALL_STATUS_IDLE) {
+                               to_return = false;
+                               break;
+                       }
+               }
+
+               err = telephony_call_release_call_list(call_list_count, &call_list);
+               if (err != TELEPHONY_ERROR_NONE) {
+                       SETTING_TRACE_ERROR("Function telephony_call_release_call_list() failed. Error: %s", get_error_message(err));
+               }
+
+               if (to_return == false) {
+                       break;
+               }
+       }
+
+       err = telephony_deinit(&handle_list);
+       if (err != TELEPHONY_ERROR_NONE) {
+               SETTING_TRACE_ERROR("Function telephony_deinit() failed. Error: %s", get_error_message(err));
+               return false;
+       }
+
+       return to_return;
+}

diff --git a/setting-profile/CMakeLists.txt b/setting-profile/CMakeLists.txt
index 50071b2fb87685ab7eb0c99565c56e25468f043a..c58d8d8e37647f53649883587a56cfd76633dabe 100755 (executable)
--- a/setting-profile/CMakeLists.txt
+++ b/setting-profile/CMakeLists.txt
@@ -12,6 +12,7 @@ pkg_check_modules(pkgs_profile REQUIRED
        capi-media-player
        capi-media-sound-manager
        capi-system-system-settings
+       capi-telephony
        dlog
        efl-extension
        elementary

diff --git a/setting-profile/src/setting-profile-common.c b/setting-profile/src/setting-profile-common.c
index a1fc68a0406790f02d895d3de4e5d275be11224b..7484e9f07b2523ea402e70722793263c2772f80d 100755 (executable)
--- a/setting-profile/src/setting-profile-common.c
+++ b/setting-profile/src/setting-profile-common.c
@@ -19,12 +19,13 @@
  *
  */
 
-#include "setting-profile.h"
+#include <telephony/telephony.h>
 #include <sys/stat.h>
 #include <dirent.h>
 #include <app_manager.h>
 #include <metadata_extractor.h>
 #include <player.h>
+#include "setting-profile.h"
 
 #define SETTING_DEFAULT_FOLDER_PATH    _TZ_SYS_GLOBALUSER_DATA"/settings/"
 #define SDCARD_PATH    _TZ_SYS_MEDIA"/sdcard/"
@@ -59,6 +60,7 @@ static Evas_Object *__sound_slider_icon_get(void *data, Evas_Object *obj,
 static int __listen_vconf_change(void *data);
 static int __unlisten_vconf_change(void *data);
 static void __calling_popup_cb(void *data, Evas_Object *obj, void *event_info);
+bool is_call_status_idle(void);
 
 void setting_sound_update_do_not_disturb_item(void *data)
 {
@@ -605,13 +607,10 @@ void setting_sound_create_warning_popup_during_call(void *data)
        ret_if(data == NULL);
        SettingSoundData *ad = (SettingSoundData *)data;
 
-       cm_call_status_e call_status = CM_CALL_STATUS_IDLE;
-       cm_client_h cm_handle = NULL;
-       cm_init(&cm_handle);
-       cm_get_call_status(cm_handle, &call_status);
-       cm_deinit(cm_handle);
-       if (CM_CALL_STATUS_IDLE != call_status) {
-               SETTING_TRACE("Call status is not OFF (%d)", call_status);
+       bool is_idle  = is_call_status_idle();
+
+       if (!is_idle) {
+               SETTING_TRACE("Call status is not OFF (%d)", is_idle);
                if (!ad->calling_popup) {
                        ad->calling_popup = setting_create_popup(
                                        ad,
@@ -1333,4 +1332,62 @@ static void __sound_stream_focus_state_changed_cb(
        }
 }
 
+bool is_call_status_idle(void)
+{
+       SETTING_TRACE_BEGIN;
+
+       unsigned int i = 0;
+       unsigned int j = 0;
+       unsigned int call_list_count = 0;
+       telephony_handle_list_s handle_list;
+       telephony_call_h *call_list;
+       telephony_call_status_e status = TELEPHONY_CALL_STATUS_IDLE;
+       bool to_return = true;
+
+
+       int err = telephony_init(&handle_list);
+       if (err != TELEPHONY_ERROR_NONE) {
+               SETTING_TRACE_ERROR("Function telephony_init() failed. Error: %s", get_error_message(err));
+               return false;
+       }
+
+       for (i = 0; i < handle_list.count; ++i) {
+               err = telephony_call_get_call_list(handle_list.handle[i], &call_list_count, &call_list);
+               if (err != TELEPHONY_ERROR_NONE) {
+                       SETTING_TRACE_ERROR("Function telephony_call_get_call_list() failed. Error: %s", get_error_message(err));
+                       continue;
+               }
+
+               for (j = 0; j < call_list_count; ++j) {
+                       err = telephony_call_get_status(call_list[j], &status);
+                       if (err != TELEPHONY_ERROR_NONE) {
+                               SETTING_TRACE_ERROR("Function telephony_call_get_status() failed. Error: %s", get_error_message(err));
+                               continue;
+                       }
+
+                       if (status != TELEPHONY_CALL_STATUS_IDLE) {
+                               to_return = false;
+                               break;
+                       }
+               }
+
+               err = telephony_call_release_call_list(call_list_count, &call_list);
+               if (err != TELEPHONY_ERROR_NONE) {
+                       SETTING_TRACE_ERROR("Function telephony_call_release_call_list() failed. Error: %s", get_error_message(err));
+               }
+
+               if (to_return == false) {
+                       break;
+               }
+       }
+
+       err = telephony_deinit(&handle_list);
+       if (err != TELEPHONY_ERROR_NONE) {
+               SETTING_TRACE_ERROR("Function telephony_deinit() failed. Error: %s", get_error_message(err));
+               return false;
+       }
+
+       SETTING_TRACE_DEBUG("is_call_status: %d", to_return);
+       return to_return;
+}
 

diff --git a/setting-ringtone/CMakeLists.txt b/setting-ringtone/CMakeLists.txt
index 61a21cd3c82c93069f8e5891e15d6d7a6e02b2bf..c87ac8dd311c77eaade07bef0779629e9b59abcf 100755 (executable)
--- a/setting-ringtone/CMakeLists.txt
+++ b/setting-ringtone/CMakeLists.txt
@@ -16,6 +16,7 @@ pkg_check_modules(pkgs_ringtone REQUIRED
        efl-extension
        callmgr_client
        capi-media-player
+       capi-telephony
 )
 
 FOREACH(flag ${pkgs_ringtone_CFLAGS})

diff --git a/setting-ringtone/src/setting-ringtone-main.c b/setting-ringtone/src/setting-ringtone-main.c
index f8d8d439fee2b9f6ab14665307392370064df927..231a990842dc9d4fde176323983608f7bda9a12d 100755 (executable)
--- a/setting-ringtone/src/setting-ringtone-main.c
+++ b/setting-ringtone/src/setting-ringtone-main.c
@@ -22,6 +22,7 @@
 #include "setting-ringtone-main.h"
 #include "setting-ringtone-util.h"
 #include "setting-ringtone-remove.h"
+#include <telephony/telephony.h>
 #include "setting-common-general-func.h"
 #include "setting-common-draw-widget.h"
 #include <efl_extension_events.h>
@@ -74,6 +75,8 @@ static bool _system_setting_get_ringtone_list_cb(int index, const char* value,
                                                void *user_data);
 static void _create_main_ui_list(SettingRingtoneData *ad);
 
+bool is_call_status_idle(void);
+
 
 static int setting_ringtone_create(void *cb)
 {
@@ -221,8 +224,7 @@ static void _done_click_cb(void *data, Evas_Object *obj,
 
 static void _item_selected_cb(void *data, Evas_Object *obj, void *event_info)
 {
-       cm_call_status_e call_status = CM_CALL_STATUS_IDLE;
-       cm_client_h cm_handle = NULL;
+       bool is_idle;
        Setting_GenGroupItem_Data *list_item = NULL;
        Elm_Object_Item *item = (Elm_Object_Item *)event_info;
        SettingRingtoneData *ad = (SettingRingtoneData *)data;
@@ -242,11 +244,9 @@ static void _item_selected_cb(void *data, Evas_Object *obj, void *event_info)
        ad->selected_file_path = strdup(list_item->filepath);
        ad->selected_item_data = list_item;
 
-       cm_init(&cm_handle);
-       cm_get_call_status(cm_handle, &call_status);
-       cm_deinit(cm_handle);
+       is_idle = is_call_status_idle();
 
-       if ((CM_CALL_STATUS_IDLE == call_status) && ad->selected_file_path) {
+       if (is_idle && ad->selected_file_path) {
                SETTING_TRACE("sel file: %s", ad->selected_file_path);
                if (ad->media_player)
                        ringtone_stop_sound(ad);
@@ -261,8 +261,7 @@ static void _item_selected_cb(void *data, Evas_Object *obj, void *event_info)
 static void _radio_changed_cb(void *data, Evas_Object *radio, void *event_info)
 {
        SETTING_TRACE_BEGIN;
-       cm_call_status_e call_status = CM_CALL_STATUS_IDLE;
-       cm_client_h cm_handle = NULL;
+       bool is_idle;
        /* the list item data this radio is in: */
        Setting_GenGroupItem_Data *list_item = data;
        SettingRingtoneData *ad = NULL;
@@ -280,11 +279,9 @@ static void _radio_changed_cb(void *data, Evas_Object *radio, void *event_info)
        if (ad->media_player)
                ringtone_stop_sound(ad);
 
-       cm_init(&cm_handle);
-       cm_get_call_status(cm_handle, &call_status);
-       cm_deinit(cm_handle);
+       is_idle = is_call_status_idle();
 
-       if ((CM_CALL_STATUS_IDLE == call_status) && safeStrCmp(
+       if (is_idle && safeStrCmp(
                list_item->keyStr, "IDS_ST_BODY_PHONEPROFILES_SILENT")
                )
                ringtone_play_sound(ad);
@@ -710,3 +707,59 @@ static void _create_main_ui_list(SettingRingtoneData *ad)
 
        free(default_file_path);
 }
+
+bool is_call_status_idle(void)
+{
+       unsigned int i = 0;
+       unsigned int j = 0;
+       unsigned int call_list_count = 0;
+       telephony_handle_list_s handle_list;
+       telephony_call_h *call_list;
+       telephony_call_status_e status = TELEPHONY_CALL_STATUS_IDLE;
+       bool to_return = true;
+
+
+       int err = telephony_init(&handle_list);
+       if (err != TELEPHONY_ERROR_NONE) {
+               SETTING_TRACE_ERROR("Function telephony_init() failed. Error: %s", get_error_message(err));
+               return false;
+       }
+
+       for (i = 0; i < handle_list.count; ++i) {
+               err = telephony_call_get_call_list(handle_list.handle[i], &call_list_count, &call_list);
+               if (err != TELEPHONY_ERROR_NONE) {
+                       SETTING_TRACE_ERROR("Function telephony_call_get_call_list() failed. Error: %s", get_error_message(err));
+                       continue;
+               }
+
+               for (j = 0; j < call_list_count; ++j) {
+                       err = telephony_call_get_status(call_list[j], &status);
+                       if (err != TELEPHONY_ERROR_NONE) {
+                               SETTING_TRACE_ERROR("Function telephony_call_get_status() failed. Error: %s", get_error_message(err));
+                               continue;
+                       }
+
+                       if (status != TELEPHONY_CALL_STATUS_IDLE) {
+                               to_return = false;
+                               break;
+                       }
+               }
+
+               err = telephony_call_release_call_list(call_list_count, &call_list);
+               if (err != TELEPHONY_ERROR_NONE) {
+                       SETTING_TRACE_ERROR("Function telephony_call_release_call_list() failed. Error: %s", get_error_message(err));
+               }
+
+               if (to_return == false) {
+                       break;
+               }
+       }
+
+       err = telephony_deinit(&handle_list);
+       if (err != TELEPHONY_ERROR_NONE) {
+               SETTING_TRACE_ERROR("Function telephony_deinit() failed. Error: %s", get_error_message(err));
+               return false;
+       }
+
+       return to_return;
+}

diff --git a/setting-ringtone/tizen-manifest.xml b/setting-ringtone/tizen-manifest.xml
new file mode 100644 (file)
index 0000000..a4e7e20
--- /dev/null
+++ b/setting-ringtone/tizen-manifest.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<manifest xmlns="http://tizen.org/ns/packages" api-version="4.0" package="org.tizen.setting-ringtone2" version="1.0.0">
+    <profile name="mobile"/>
+    <ui-application appid="org.tizen.setting-ringtone2" exec="setting-ringtone" hw-acceleration="on" launch_mode="caller" multiple="true" nodisplay="true" taskmanage="false" type="capp">
+        <label>Ringtone</label>
+        <label xml:lang="en-gb">Ringtone</label>
+        <label xml:lang="en-ph">Ringtone</label>
+        <label xml:lang="en-us">Ringtone</label>
+        <metadata key="http://developer.samsung.com/tizen/metadata/legacylifecycle"/>
+    </ui-application>
+    <privileges>
+        <privilege>http://tizen.org/privilege/apphistory.read</privilege>
+        <privilege>http://tizen.org/privilege/account.read</privilege>
+        <privilege>http://tizen.org/privilege/mediahistory.read</privilege>
+        <privilege>http://tizen.org/privilege/haptic</privilege>
+        <privilege>http://tizen.org/privilege/display</privilege>
+        <privilege>http://tizen.org/privilege/datasharing</privilege>
+        <privilege>http://tizen.org/privilege/packagemanager.info</privilege>
+        <privilege>http://tizen.org/privilege/application.launch</privilege>
+        <privilege>http://tizen.org/privilege/packagemanager.install</privilege>
+        <privilege>http://tizen.org/privilege/mediastorage</privilege>
+        <privilege>http://tizen.org/privilege/telephony.admin</privilege>
+        <privilege>http://tizen.org/privilege/network.get</privilege>
+        <privilege>http://tizen.org/privilege/appmanager.kill</privilege>
+        <privilege>http://tizen.org/privilege/package.info</privilege>
+        <privilege>http://tizen.org/privilege/system</privilege>
+        <privilege>http://tizen.org/privilege/alarm.set</privilege>
+        <privilege>http://tizen.org/privilege/http</privilege>
+        <privilege>http://tizen.org/privilege/externalstorage.appdata</privilege>
+        <privilege>http://tizen.org/privilege/network.profile</privilege>
+        <privilege>http://tizen.org/privilege/fullscreen</privilege>
+        <privilege>http://tizen.org/privilege/telephony</privilege>
+        <privilege>http://tizen.org/privilege/packagemanager.clearcache</privilege>
+        <privilege>http://tizen.org/privilege/systemmonitor</privilege>
+        <privilege>http://tizen.org/privilege/systemsettings.admin</privilege>
+        <privilege>http://tizen.org/privilege/content.read</privilege>
+        <privilege>http://tizen.org/privilege/network.set</privilege>
+        <privilege>http://tizen.org/privilege/account.write</privilege>
+        <privilege>http://tizen.org/privilege/nfc.admin</privilege>
+        <privilege>http://tizen.org/privilege/filesystem.write</privilege>
+        <privilege>http://tizen.org/privilege/tethering.admin</privilege>
+        <privilege>http://tizen.org/privilege/ime</privilege>
+        <privilege>http://tizen.org/privilege/dpm.password</privilege>
+        <privilege>http://tizen.org/privilege/externalstorage</privilege>
+        <privilege>http://tizen.org/privilege/systemmanager</privilege>
+        <privilege>http://tizen.org/privilege/appmanager.kill.bgapp</privilege>
+        <privilege>http://tizen.org/privilege/appmanager.launch</privilege>
+        <privilege>http://tizen.org/privilege/filesystem.read</privilege>
+        <privilege>http://tizen.org/privilege/volume.set</privilege>
+        <privilege>http://tizen.org/privilege/internet</privilege>
+        <privilege>http://tizen.org/privilege/notification</privilege>
+        <privilege>http://tizen.org/privilege/packagemanager.admin</privilege>
+    </privileges>
+</manifest>

diff --git a/setting-smartmanager/smartmanager-data/include/smartmanager-data.h b/setting-smartmanager/smartmanager-data/include/smartmanager-data.h
index cb60a1a24e5036f5aa42523023294b1698588bb4..b2e5a9e8aad541b3e2e4aed7ded022ecc31d6bef 100755 (executable)
--- a/setting-smartmanager/smartmanager-data/include/smartmanager-data.h
+++ b/setting-smartmanager/smartmanager-data/include/smartmanager-data.h
@@ -10,7 +10,7 @@
 
 #include <app.h>
 #include <dlog.h>
-#include <telephony.h>
+#include <telephony/telephony.h>
 #include <stc.h>
 #include <app_info.h>
 #include <app_manager.h>

diff --git a/setting-smartmanager/smartmanager-data/include/smartmanager-utils.h b/setting-smartmanager/smartmanager-data/include/smartmanager-utils.h
index c2b2c57e19196e49f5f9fd93a9a4588957087a93..bfd925f7e1a62eef76e2fb0fdfaf00d5bc937d2f 100755 (executable)
--- a/setting-smartmanager/smartmanager-data/include/smartmanager-utils.h
+++ b/setting-smartmanager/smartmanager-data/include/smartmanager-utils.h
@@ -23,7 +23,7 @@
 #include <stc.h>
 #include <stc_internal.h>
 #include <stdbool.h>
-#include <telephony.h>
+#include <telephony/telephony.h>
 
 typedef enum {
        DATA_RESTRICTION_LIMIT,