From: minkyu kim <imetjade.kim@samsung.com>
Date: Fri, 26 Apr 2013 09:34:13 +0000 (+0900)
Subject: DCM-1514 : do not call keyEventListener if key is invalid
X-Git-Tag: accepted/tizen_2.1/20130426.150533~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3aa97585c2a7cd6ebe1ebef78f681ac40e2bb1ff;p=platform%2Fframework%2Fnative%2Fuifw.git

DCM-1514 : do not call keyEventListener if key is invalid

Change-Id: Iac59f6120cd2bd1ac1cbf376f8d1f87d7bcfa9d9
---

diff --git a/src/ui/FUi_EflUiEventManager.cpp b/src/ui/FUi_EflUiEventManager.cpp
index 6532ce6..100d791 100644
--- a/src/ui/FUi_EflUiEventManager.cpp
+++ b/src/ui/FUi_EflUiEventManager.cpp
@@ -844,7 +844,12 @@ OnKeyPressed(void* pData __UNUSED__, int type __UNUSED__, void* pEventInfo)
 	Ecore_Event_Key* pEv = static_cast <Ecore_Event_Key*>(pEventInfo);
 	SysTryReturn(NID_UI, pEv, ECORE_CALLBACK_PASS_ON, E_INVALID_ARG, "[E_INVALID_ARG] The argument is invalid.");
 
-	//SysLog(NID_UI, "OnKeyPressed(%s, %d)", pEv->keyname, pEv->modifiers);
+	if (_KeyEvent::GetKeyCode(pEv->keyname) == _KEY_INVALID)
+	{
+		SysLog(NID_UI, "KeyCode is Invalid");
+		return ECORE_CALLBACK_PASS_ON;
+	}
+
 	_KeyEvent event(KEY_PRESSED, _KeyEvent::GetKeyCode(pEv->keyname), _KeyEvent::GetKeyModifier(pEv->modifiers), pEv);
 	SysSecureLog(NID_UI, "KeyName = %s, KeyCode = %d, KeyModifier = %x", pEv->keyname, _KeyEvent::GetKeyCode(pEv->keyname), _KeyEvent::GetKeyModifier(pEv->modifiers));
 	event.Send();
@@ -860,7 +865,12 @@ OnKeyReleased(void* pData __UNUSED__, int type __UNUSED__, void* pEventInfo)
 	Ecore_Event_Key* pEv = static_cast <Ecore_Event_Key*>(pEventInfo);
 	SysTryReturn(NID_UI, pEv, ECORE_CALLBACK_PASS_ON, E_INVALID_ARG, "[E_INVALID_ARG] The argument is invalid.");
 
-	//SysLog(NID_UI, "OnKeyReleased(%s, %d)", pEv->keyname, pEv->modifiers);
+	if (_KeyEvent::GetKeyCode(pEv->keyname) == _KEY_INVALID)
+	{
+		SysLog(NID_UI, "KeyCode is Invalid");
+		return ECORE_CALLBACK_PASS_ON;
+	}
+
 	_KeyEvent event(KEY_RELEASED, _KeyEvent::GetKeyCode(pEv->keyname), _KeyEvent::GetKeyModifier(pEv->modifiers), pEv);
 	SysSecureLog(NID_UI, "KeyName = %s, KeyCode = %d, KeyModifier = %x", pEv->keyname, _KeyEvent::GetKeyCode(pEv->keyname), _KeyEvent::GetKeyModifier(pEv->modifiers));
 	event.Send();