diff --git a/android/src/main/java/SuperTuxKartActivity.java b/android/src/main/java/SuperTuxKartActivity.java
index 6bf6c6ef7..32d74f075 100644
--- a/android/src/main/java/SuperTuxKartActivity.java
+++ b/android/src/main/java/SuperTuxKartActivity.java
@@ -219,6 +219,10 @@ public class SuperTuxKartActivity extends NativeActivity
         int action = event.getAction();
         int device_id = event.getDeviceId();
         int source = event.getSource();
+        int meta_state = event.getMetaState();
+        int scan_code = event.getScanCode();
+        // KeyCharacterMap.COMBINING_ACCENT is not handled at the moment
+        int unichar = event.getUnicodeChar(meta_state);
 
         // Dispatch the different events depending on where they come from
         // Some SOURCE_JOYSTICK, SOURCE_DPAD or SOURCE_GAMEPAD are also SOURCE_KEYBOARD
@@ -232,19 +236,17 @@ public class SuperTuxKartActivity extends NativeActivity
             // Note that we process events with specific key codes here
             if (action == KeyEvent.ACTION_DOWN)
             {
-                if (SDLControllerManager.onNativePadDown(device_id, key_code) == 0)
+                if (SDLControllerManager.onNativePadDown(device_id, key_code, meta_state, scan_code, unichar) == 0)
                     return true;
             }
             else if (action == KeyEvent.ACTION_UP)
             {
-                if (SDLControllerManager.onNativePadUp(device_id, key_code) == 0)
+                if (SDLControllerManager.onNativePadUp(device_id, key_code, meta_state, scan_code, unichar) == 0)
                     return true;
             }
         }
 
         int repeat_count = event.getRepeatCount();
-        int meta_state = event.getMetaState();
-        int scan_code = event.getScanCode();
         // User pressed back button
         if (key_code == KeyEvent.KEYCODE_BACK &&
             action == KeyEvent.ACTION_DOWN)
@@ -287,8 +289,6 @@ public class SuperTuxKartActivity extends NativeActivity
             if (has_hardware_keyboard &&
                 m_stk_edittext != null && m_stk_edittext.isFocused())
                 m_stk_edittext.beforeHideKeyboard(/*clear_text*/true);
-            // KeyCharacterMap.COMBINING_ACCENT is not handled at the moment
-            int unichar = event.getUnicodeChar(meta_state);
             addKey(key_code, action, meta_state, scan_code, unichar);
             // We use only java to handle key for hardware keyboard
             return true;
diff --git a/lib/irrlicht/source/Irrlicht/CIrrDeviceAndroid.cpp b/lib/irrlicht/source/Irrlicht/CIrrDeviceAndroid.cpp
index 009810797..3a0742c8f 100644
--- a/lib/irrlicht/source/Irrlicht/CIrrDeviceAndroid.cpp
+++ b/lib/irrlicht/source/Irrlicht/CIrrDeviceAndroid.cpp
@@ -52,11 +52,7 @@ ANDROID_ADD_TOUCH_CALLBACK(ANDROID_PACKAGE_CALLBACK_NAME)
     g_events.push_back(event);
 }
 
-#define ADD_KEY_CALLBACK(x) JNIEXPORT void JNICALL Java_ ## x##_SuperTuxKartActivity_addKey(JNIEnv* env, jobject this_obj, jint key_code, jint action, jint meta_state, jint scan_code, jint unichar)
-#define ANDROID_ADD_KEY_CALLBACK(PKG_NAME) ADD_KEY_CALLBACK(PKG_NAME)
-
-extern "C"
-ANDROID_ADD_KEY_CALLBACK(ANDROID_PACKAGE_CALLBACK_NAME)
+extern "C" void stkAddKeyEvent(int key_code, int action, int meta_state, int scan_code, int unichar)
 {
     irr::SEvent event;
     event.EventType = irr::EET_KEY_INPUT_EVENT;
@@ -93,6 +89,14 @@ ANDROID_ADD_KEY_CALLBACK(ANDROID_PACKAGE_CALLBACK_NAME)
     g_events.push_back(event);
 }
 
+#define ADD_KEY_CALLBACK(x) JNIEXPORT void JNICALL Java_ ## x##_SuperTuxKartActivity_addKey(JNIEnv* env, jobject this_obj, jint key_code, jint action, jint meta_state, jint scan_code, jint unichar)
+#define ANDROID_ADD_KEY_CALLBACK(PKG_NAME) ADD_KEY_CALLBACK(PKG_NAME)
+
+extern "C"
+ANDROID_ADD_KEY_CALLBACK(ANDROID_PACKAGE_CALLBACK_NAME)
+{
+    stkAddKeyEvent(key_code, action, meta_state, scan_code, unichar);
+}
 
 namespace irr
 {