From: Igor Olshevskyi Date: Fri, 8 Apr 2016 08:52:59 +0000 (+0300) Subject: TizenRefApp-6108 [Call UI] Add lacking privilegues X-Git-Tag: accepted/tizen/mobile/20160411.005619^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=257b93389431d496567d3c77195a40ee3c58e7e6;p=profile%2Fmobile%2Fapps%2Fnative%2Fcall-ui.git TizenRefApp-6108 [Call UI] Add lacking privilegues Change-Id: Iec2d840db5f752b4bd00d061595062065a16b3d3 --- diff --git a/org.tizen.call-ui.xml b/org.tizen.call-ui.xml index f341e1f..fb605a0 100644 --- a/org.tizen.call-ui.xml +++ b/org.tizen.call-ui.xml @@ -13,6 +13,8 @@ + http://tizen.org/privilege/window.priority.set + http://tizen.org/privilege/keygrab http://tizen.org/privilege/appmanager.launch http://tizen.org/privilege/contact.read http://tizen.org/privilege/notification diff --git a/src/callui-common.c b/src/callui-common.c index 838eca2..c7f831e 100755 --- a/src/callui-common.c +++ b/src/callui-common.c @@ -160,7 +160,10 @@ callui_idle_lock_type_t _callui_common_get_idle_lock_type(void) int _callui_common_unlock_swipe_lock(void) { - vconf_set_int(VCONFKEY_IDLE_LOCK_STATE, VCONFKEY_IDLE_UNLOCK); + int res = vconf_set_int(VCONFKEY_IDLE_LOCK_STATE, VCONFKEY_IDLE_UNLOCK); + if (res != 0) { + err("Set flag IDLE_UNLOCK failed"); + } return 0; } diff --git a/src/callui-view-incoming-call-noti.c b/src/callui-view-incoming-call-noti.c index bbac5c7..5fa0f72 100644 --- a/src/callui-view-incoming-call-noti.c +++ b/src/callui-view-incoming-call-noti.c @@ -102,7 +102,7 @@ static callui_result_e __callui_view_incoming_call_noti_oncreate(call_view_data_ evas_object_resize(ad->win, ad->root_w, ELM_SCALE_SIZE(MTLOCK_ACTIVE_NOTI_CALL_HEIGHT)); _callui_common_win_set_noti_type(ad, true); - if (elm_win_keygrab_set(ad->win, CALLUI_KEY_SELECT, 0, 0, 0, ELM_WIN_KEYGRAB_TOPMOST)) { + if (!elm_win_keygrab_set(ad->win, CALLUI_KEY_SELECT, 0, 0, 0, ELM_WIN_KEYGRAB_TOPMOST)) { dbg("KEY_SELECT key grab failed"); } diff --git a/src/callui-view-incoming-call.c b/src/callui-view-incoming-call.c index c86f123..173cc39 100644 --- a/src/callui-view-incoming-call.c +++ b/src/callui-view-incoming-call.c @@ -127,7 +127,7 @@ static callui_result_e __callui_view_incoming_call_oncreate(call_view_data_base_ evas_object_pointer_mode_set(ad->win, EVAS_OBJECT_POINTER_MODE_NOGRAB); - if (elm_win_keygrab_set(ad->win, CALLUI_KEY_SELECT, 0, 0, 0, ELM_WIN_KEYGRAB_TOPMOST)) { + if (!elm_win_keygrab_set(ad->win, CALLUI_KEY_SELECT, 0, 0, 0, ELM_WIN_KEYGRAB_TOPMOST)) { dbg("KEY_SELECT key grab failed"); } diff --git a/src/callui.c b/src/callui.c index e68d416..a39a358 100755 --- a/src/callui.c +++ b/src/callui.c @@ -55,7 +55,7 @@ static void __callui_app_win_key_grab(callui_app_data_t *ad) { int result = 0; result = elm_win_keygrab_set(ad->win, CALLUI_KEY_MEDIA, 0, 0, 0, ELM_WIN_KEYGRAB_EXCLUSIVE); - if (result) + if (!result) dbg("KEY_MEDIA key grab failed"); if (_callui_common_is_powerkey_mode_on()) { @@ -63,7 +63,7 @@ static void __callui_app_win_key_grab(callui_app_data_t *ad) } else { result = elm_win_keygrab_set(ad->win, CALLUI_KEY_POWER, 0, 0, 0, ELM_WIN_KEYGRAB_SHARED); } - if (result) { + if (!result) { dbg("KEY_POWER key grab failed"); } @@ -217,7 +217,7 @@ static void __callui_win_delete_request_cb(void *data, Evas_Object *obj, void *e static Evas_Object *__callui_create_main_win(callui_app_data_t *ad) { dbg("Create window"); - Evas_Object *eo = elm_win_add(NULL, PACKAGE, ELM_WIN_BASIC); + Evas_Object *eo = elm_win_add(NULL, PACKAGE, ELM_WIN_NOTIFICATION); elm_win_aux_hint_add(eo, "wm.policy.win.user.geometry", "1"); elm_win_fullscreen_set(eo, EINA_FALSE); elm_win_alpha_set(eo, EINA_TRUE); @@ -664,7 +664,7 @@ static Eina_Bool __callui_app_win_hard_key_up_cb(void *data, int type, void *eve dbg("in KEY_SELECT"); int result = 0; result = elm_win_keygrab_unset(ad->win, CALLUI_KEY_SELECT, 0, 0); - if (result) { + if (!result) { dbg("KEY_SELECT key ungrab failed"); } else { dbg("KEY_SELECT key ungrab success"); @@ -693,7 +693,7 @@ static Eina_Bool __callui_app_win_hard_key_up_cb(void *data, int type, void *eve _callui_load_second_call_popup(ad); } } else { - if (elm_win_keygrab_set(ad->win, CALLUI_KEY_SELECT, 0, 0, 0, ELM_WIN_KEYGRAB_TOPMOST)) { + if (!elm_win_keygrab_set(ad->win, CALLUI_KEY_SELECT, 0, 0, 0, ELM_WIN_KEYGRAB_TOPMOST)) { dbg("KEY_SELECT key ungrab failed"); } } diff --git a/tizen-manifest.xml b/tizen-manifest.xml index cf3f89b..826fc85 100644 --- a/tizen-manifest.xml +++ b/tizen-manifest.xml @@ -15,6 +15,8 @@ + http://tizen.org/privilege/window.priority.set + http://tizen.org/privilege/keygrab http://tizen.org/privilege/notification http://tizen.org/privilege/appmanager.launch http://tizen.org/privilege/message.write