Mirrors_Framework/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-12-15 19:35:06 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bug #9331 - SDL3 Android crash getVibrator() == null

Browse Source
This commit is contained in:
Sylvain
2024-03-22 21:26:23 +01:00
committed by Sam Lantinga
parent 208cd434b5
commit 1855ce68af
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -546,6 +546,7 @@ class SDLHapticHandler {
if (haptic == null) { if (haptic == null) {
InputDevice device = InputDevice.getDevice(deviceIds[i]); InputDevice device = InputDevice.getDevice(deviceIds[i]);
Vibrator vib = device.getVibrator(); Vibrator vib = device.getVibrator();
if (vib != null) {
if (vib.hasVibrator()) { if (vib.hasVibrator()) {
haptic = new SDLHaptic(); haptic = new SDLHaptic();
haptic.device_id = deviceIds[i]; haptic.device_id = deviceIds[i];
@@ -556,6 +557,7 @@ class SDLHapticHandler {
} }
} }
} }
}
/* Check VIBRATOR_SERVICE */ /* Check VIBRATOR_SERVICE */
Vibrator vib = (Vibrator) SDL.getContext().getSystemService(Context.VIBRATOR_SERVICE); Vibrator vib = (Vibrator) SDL.getContext().getSystemService(Context.VIBRATOR_SERVICE);