mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2026-05-27 23:35:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Change controller sensor state on the main UI thread on Android"

Browse Source 
This reverts commit c362f1341f.

It turns out this change causes a deadlock:
The main UI thread calls synchronized handleMotionEvent() which then calls SDL_LockJoysticks()
The main app thread calls SDL_LockJoysticks() and then synchronized pollInputDevices()
This commit is contained in:
Sam Lantinga
2026-05-17 12:04:11 -07:00
parent cbd2917324
commit 02975994c1
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
android-project/app/src/main/java/org/libsdl/app/SDLControllerManager.java
View File

@@ -91,13 +91,7 @@ public class SDLControllerManager
* This method is called by SDL using JNI.
*/
static void joystickSetSensorsEnabled(int device_id, boolean enabled) {
// Run this on the UI thread so we don't race with enableSensor() in SDLSurface.java
SDL.getContext().runOnUiThread(new Runnable() {
@Override
public void run() {
mJoystickHandler.setSensorsEnabled(device_id, enabled);
}
});
mJoystickHandler.setSensorsEnabled(device_id, enabled);
}
/**