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 (file)
--- 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();