TizenRefApp-7065 [Call UI] Fix issue with proximity sensor lock mode and end call...

Change-Id: I518a550d8e03df9d85ea459248222f1e920ef201

diff --git a/inc/callui-view-manager.h b/inc/callui-view-manager.h
index de3a230..7aa97e2 100644 (file)
--- a/inc/callui-view-manager.h
+++ b/inc/callui-view-manager.h
@@ -34,7 +34,6 @@ typedef enum {
        CALLUI_VIEW_MULTICALL_CONF,             /**< Multicall conference view */
        CALLUI_VIEW_MULTICALL_LIST,             /**< Multicall list view */
        CALLUI_VIEW_ENDCALL,                    /**< End call view */
-       CALLUI_VIEW_QUICKPANEL,                 /**< Quick panel view */
        CALLUI_VIEW_COUNT                               /**< View count*/
 } callui_view_type_e;
 

diff --git a/src/callui-common.c b/src/callui-common.c
index b16016e..9936ffa 100755 (executable)
--- a/src/callui-common.c
+++ b/src/callui-common.c
@@ -408,7 +408,7 @@ bool _callui_common_is_homekey_answering_call_mode_on(void)
        int answerMode = 0;
        int ret = vconf_get_bool(VCONFKEY_CISSAPPL_ANSWERING_KEY_BOOL, &answerMode);
        if (!ret) {
-               dbg("Homekey answering call mode [%s]", answerMode ? "ON":"OFF");
+               dbg("Home key answering call mode [%s]", answerMode ? "ON":"OFF");
        } else {
                dbg("vconf_get_bool failed. res[%d]", ret);
        }
@@ -425,7 +425,7 @@ bool _callui_common_is_powerkey_ending_call_mode_on(void)
        int powerkey_mode = 0;
        int ret = vconf_get_bool(VCONFKEY_CISSAPPL_POWER_KEY_ENDS_CALL_BOOL, &powerkey_mode);
        if (!ret) {
-               dbg("Powerkey ending call mode [%s]", powerkey_mode ? "ON":"OFF");
+               dbg("Power key ending call mode [%s]", powerkey_mode ? "ON":"OFF");
        } else {
                dbg("vconf_get_bool failed. res[%d]", ret);
        }
@@ -442,7 +442,10 @@ static void _check_and_try_make_delayed_app_launch_request(callui_app_data_t *ad
        int ret;
        if ((ret = app_control_send_launch_request(ad->delayed_app_control, __app_launch_reply_cb, ad)) != APP_CONTROL_ERROR_NONE) {
                err("app_control_send_launch_request() is failed. ret[%d]", ret);
+       } else {
+               __try_to_stop_lock_manager(ad);
        }
+
        app_control_destroy(ad->delayed_app_control);
        ad->delayed_app_control = NULL;
 }

diff --git a/src/callui.c b/src/callui.c
index d8af979..75ea953 100755 (executable)
--- a/src/callui.c
+++ b/src/callui.c
@@ -591,13 +591,13 @@ static void __app_pause(void *data)
 
        callui_app_data_t *ad = data;
 
+       ad->on_background = true;
+
        if (_callui_lock_manager_is_started(ad->lock_handle)) {
                _callui_lock_manager_stop(ad->lock_handle);
                ad->start_lock_manager_on_resume = true;
        }
 
-       ad->on_background = true;
-
        _callui_vm_pause(ad->view_manager);
 
        DELETE_ECORE_TIMER(ad->app_state_check_timer);
@@ -733,6 +733,12 @@ static void __process_power_key_up(callui_app_data_t *ad)
        callui_display_state_e state;
 
        if (_callui_common_is_powerkey_ending_call_mode_on()) {
+
+               if (_callui_lock_manager_is_lcd_off(ad->lock_handle)) {
+                       dbg("Lock Manager LCD status [OFF]. Ignore Power key ending call mode");
+                       return;
+               }
+
                if (view_type == CALLUI_VIEW_DIALLING) {
                        if (active) {
                                _callui_manager_end_call(ad->call_manager, active->call_id, CALLUI_CALL_RELEASE_BY_CALL_HANDLE);