Skip to content

Fix Android fingerprint scanners being recognized as joypads #114334

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Nintorch wants to merge 1 commit into
base: master
Choose a base branch
from
+17 −0
Open

Fix Android fingerprint scanners being recognized as joypads #114334

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions platform/android/java/lib/src/main/java/org/godotengine/godot/input/GodotInputHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<>();
Expand Down Expand Up @@ -359,6 +369,13 @@ public void onInputDeviceAdded(int deviceId) {
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);

Expand Down