godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-03 19:11:41 +00:00
Code Releases Wiki Activity

Merge pull request #114334 from Nintorch/android-fix-joypad-fingerprints

Browse Source 
Fix Android fingerprint scanners being recognized as joypads
This commit is contained in:
Rémi Verschelde
2026-01-01 16:47:09 +01:00
parent 44f444a1d8 66e357f29a
commit d45718ecb4
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
platform/android/java/lib/src/main/java/org/godotengine/godot/input/GodotInputHandler.java
View File

@@ -70,6 +70,16 @@ public class GodotInputHandler implements InputManager.InputDeviceListener, Sens
private static final int ROTARY_INPUT_VERTICAL_AXIS = 1;
private static final int ROTARY_INPUT_HORIZONTAL_AXIS = 0;
private static final String[] JOYPAD_IGNORE_LIST = new String[] {
// Ignore fingerprint scanners.
"uinput-fpc",
"uinput-goodix",
"uinput-synaptics",
"uinput-elan",
"uinput-vfs",
"uinput-atrus",
};
private final SparseIntArray mJoystickIds = new SparseIntArray(4);
private final SparseArray<Joystick> mJoysticksDevices = new SparseArray<>(4);
private final HashSet<Integer> mHardwareKeyboardIds = new HashSet<>();
@@ -359,6 +369,13 @@ public class GodotInputHandler implements InputManager.InputDeviceListener, Sens
return;
}
for (String name : JOYPAD_IGNORE_LIST) {
if (device.getName().equals(name)) {
Log.i(TAG, "=== Input Device ignored: " + device.getName());
return;
}
}
// Assign first available number. Reuse numbers where possible.
final int id = assignJoystickIdNumber(deviceId);