mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2026-07-20 07:51:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed deadlock introduced by 7222c04fbf

Browse Source 
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:17:26 -07:00
parent b19ecb4032
commit 8c89a076a7
1 changed files with 4 additions and 4 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

@@ -346,7 +346,7 @@ class SDLJoystickHandler {
}
}
protected SDLJoystick getJoystick(int device_id) {
synchronized protected SDLJoystick getJoystick(int device_id) {
for (SDLJoystick joystick : mJoysticks) {
if (joystick.device_id == device_id) {
return joystick;
@@ -360,7 +360,7 @@ class SDLJoystickHandler {
* @param event the event to be handled.
* @return if given event was processed.
*/
synchronized boolean handleMotionEvent(MotionEvent event) {
boolean handleMotionEvent(MotionEvent event) {
int actionPointerIndex = event.getActionIndex();
int action = event.getActionMasked();
if (action == MotionEvent.ACTION_MOVE) {
@@ -530,7 +530,7 @@ class SDLJoystickHandler {
return button_mask;
}
synchronized void setLED(int device_id, int red, int green, int blue) {
void setLED(int device_id, int red, int green, int blue) {
if (Build.VERSION.SDK_INT < 31 /* Android 12.0 (S) */) {
return;
}
@@ -548,7 +548,7 @@ class SDLJoystickHandler {
joystick.lightsSession.requestLights(lightsRequest.build());
}
synchronized void setSensorsEnabled(int device_id, boolean enabled) {
void setSensorsEnabled(int device_id, boolean enabled) {
if (Build.VERSION.SDK_INT < 31 /* Android 12.0 (S) */) {
return;
}