From: sinikang Date: Fri, 23 Sep 2016 04:41:22 +0000 (+0900) Subject: Remove the unused function X-Git-Tag: accepted/tizen/3.0/mobile/20161015.032408^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fe456fb052c935c944db7b52384ef790f8bcf05e;p=platform%2Fcore%2Ftelephony%2Fcall-manager.git Remove the unused function - pwlock check function isn't used and so it can be removed from the lockstate check flow Signed-off-by: Shinhui Kang Change-Id: Ida7c8e4c00a1f6eb27fdfef1e08b0c95a350a143 --- diff --git a/callmgr-popup/include/callmgr-popup-vconf.h b/callmgr-popup/include/callmgr-popup-vconf.h index 451ffd4..c62ce30 100644 --- a/callmgr-popup/include/callmgr-popup-vconf.h +++ b/callmgr-popup/include/callmgr-popup-vconf.h @@ -23,7 +23,6 @@ #include "callmgr-popup-common.h" gboolean _callmgr_popup_is_idle_lock(void); -gboolean _callmgr_popup_is_pw_lock(void); gboolean _callmgr_popup_is_flight_mode(void); gboolean _callmgr_popup_is_fm_lock(void); diff --git a/callmgr-popup/src/callmgr-popup-vconf.c b/callmgr-popup/src/callmgr-popup-vconf.c index 676924f..1726f05 100644 --- a/callmgr-popup/src/callmgr-popup-vconf.c +++ b/callmgr-popup/src/callmgr-popup-vconf.c @@ -39,24 +39,6 @@ gboolean _callmgr_popup_is_idle_lock(void) } } -gboolean _callmgr_popup_is_pw_lock(void) -{ - int pwlock_state = -1; - - if (vconf_get_int(VCONFKEY_PWLOCK_STATE, &pwlock_state) < 0) { - WARN("vconf_get_int failed."); - return FALSE; - } - - DBG("pwlock_state:[%d]", pwlock_state); - if ((pwlock_state == VCONFKEY_PWLOCK_BOOTING_LOCK) - || (pwlock_state == VCONFKEY_PWLOCK_RUNNING_LOCK)) { - return TRUE; - } else { - return FALSE; - } -} - gboolean _callmgr_popup_is_flight_mode(void) { gboolean flight_mode = FALSE; diff --git a/callmgr-popup/src/callmgr-popup-widget.c b/callmgr-popup/src/callmgr-popup-widget.c index fd85415..ac95b4d 100644 --- a/callmgr-popup/src/callmgr-popup-widget.c +++ b/callmgr-popup/src/callmgr-popup-widget.c @@ -95,7 +95,6 @@ Evas_Object *_callmgr_popup_create_win(void) } if ((_callmgr_popup_is_idle_lock()) - || (_callmgr_popup_is_pw_lock()) || (_callmgr_popup_is_fm_lock())) { DBG("Set high window and block noti"); __callmgr_popup_set_win_level(eo, EINA_TRUE); diff --git a/common/include/callmgr-vconf.h b/common/include/callmgr-vconf.h index ba778fa..6de3a64 100644 --- a/common/include/callmgr-vconf.h +++ b/common/include/callmgr-vconf.h @@ -43,7 +43,6 @@ typedef enum { } call_salescode_type; int _callmgr_vconf_is_security_lock(gboolean *is_security_lock); -int _callmgr_vconf_is_pwlock(gboolean *is_pwlock); int _callmgr_vconf_is_low_battery(gboolean *is_low_battery); int _callmgr_vconf_is_sound_setting_enabled(gboolean *is_sound_enabled); int _callmgr_vconf_is_vibration_setting_enabled(gboolean *is_vibration_enabled); diff --git a/common/src/callmgr-vconf.c b/common/src/callmgr-vconf.c index c7d94f5..3c463f9 100644 --- a/common/src/callmgr-vconf.c +++ b/common/src/callmgr-vconf.c @@ -52,25 +52,6 @@ int _callmgr_vconf_is_security_lock(gboolean *is_security_lock) return 0; } -int _callmgr_vconf_is_pwlock(gboolean *is_pwlock) -{ - int pwlock_state = -1; - dbg("_callmgr_vconf_is_pwlock()"); - - if (vconf_get_int(VCONFKEY_PWLOCK_STATE, &pwlock_state) < 0) { - err("vconf_get_int failed."); - *is_pwlock = FALSE; - return -1; - } - info("pwlock_state:[%d]", pwlock_state); - if ((pwlock_state == VCONFKEY_PWLOCK_BOOTING_LOCK) || (pwlock_state == VCONFKEY_PWLOCK_RUNNING_LOCK)) { - *is_pwlock = TRUE; - } else { - *is_pwlock = FALSE; - } - return 0; -} - int _callmgr_vconf_is_low_battery(gboolean *is_low_battery) { dbg("_callmgr_vconf_is_low_battery()"); diff --git a/packaging/call-manager.spec b/packaging/call-manager.spec old mode 100644 new mode 100755 index 77434fb..b631900 --- a/packaging/call-manager.spec +++ b/packaging/call-manager.spec @@ -1,6 +1,6 @@ %define major 0 %define minor 1 -%define patchlevel 73 +%define patchlevel 74 %define ext_feature 0 Name: call-manager diff --git a/service/src/callmgr-core.c b/service/src/callmgr-core.c index 29e46ab..7c4d7da 100644 --- a/service/src/callmgr-core.c +++ b/service/src/callmgr-core.c @@ -2428,7 +2428,6 @@ int _callmgr_core_process_dial(callmgr_core_data_t *core_data, const char *numbe gboolean is_incall_ss = FALSE; gboolean is_ss = FALSE; gboolean is_number_valid = FALSE; - gboolean is_pwlock = FALSE; gboolean is_security_lock = FALSE; gboolean is_ui_visible = FALSE; cm_telepony_sim_slot_type_e active_sim = CM_TELEPHONY_SIM_UNKNOWN; @@ -2447,10 +2446,9 @@ int _callmgr_core_process_dial(callmgr_core_data_t *core_data, const char *numbe CM_SAFE_FREE(extracted_call_num); CM_SAFE_FREE(extracted_dtmf_num); - _callmgr_vconf_is_pwlock(&is_pwlock); _callmgr_vconf_is_security_lock(&is_security_lock); _callmgr_vconf_is_ui_visible(&is_ui_visible); - if (is_pwlock || is_security_lock) { + if (is_security_lock) { if (is_ui_visible) { warn("Callback case. Allow this operation!!"); } else if (!is_emergency_call && !is_emergency_contact) {