geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Android: potential ANR during onKeyDown/Up 

SDLActivity may call onNativeKeyDown, while application is quitting
main
Sylvain 2023-06-16 10:05:58 +02:00 committed by Sylvain Becker
parent e72935a445
commit 378e33bb2c
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/core/android/SDL_android.c
View File

@ -1157,7 +1157,13 @@ JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(onNativeKeyDown)(
JNIEnv *env, jclass jcls,
jint keycode)
{
Android_OnKeyDown(keycode);
SDL_LockMutex(Android_ActivityMutex);
if (Android_Window) {
Android_OnKeyDown(keycode);
}
SDL_UnlockMutex(Android_ActivityMutex);
}
/* Keyup */
@ -1165,7 +1171,13 @@ JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(onNativeKeyUp)(
JNIEnv *env, jclass jcls,
jint keycode)
{
Android_OnKeyUp(keycode);
SDL_LockMutex(Android_ActivityMutex);
if (Android_Window) {
Android_OnKeyUp(keycode);
}
SDL_UnlockMutex(Android_ActivityMutex);
}
/* Virtual keyboard return key might stop text input */