mirror of
https://github.com/Relintai/sdl2_frt.git
synced 2024-12-25 09:17:12 +01:00
Fixed bug 3843 - Android missing some code in SDLHapticHandler
Sylvain Some check for android SDK version are missing from https://hg.libsdl.org/SDL/rev/3d7a29a369a0 here's a patch
This commit is contained in:
parent
099ae43e81
commit
14ed0d24c8
@ -300,7 +300,7 @@ class SDLHapticHandler {
|
|||||||
public void pollHapticDevices() {
|
public void pollHapticDevices() {
|
||||||
|
|
||||||
final int deviceId_VIBRATOR_SERVICE = 999999;
|
final int deviceId_VIBRATOR_SERVICE = 999999;
|
||||||
boolean hasVibrator = false;
|
boolean hasVibratorService = false;
|
||||||
|
|
||||||
int[] deviceIds = InputDevice.getDeviceIds();
|
int[] deviceIds = InputDevice.getDeviceIds();
|
||||||
// It helps processing the device ids in reverse order
|
// It helps processing the device ids in reverse order
|
||||||
@ -308,7 +308,9 @@ class SDLHapticHandler {
|
|||||||
// so the first controller seen by SDL matches what the receiver
|
// so the first controller seen by SDL matches what the receiver
|
||||||
// considers to be the first controller
|
// considers to be the first controller
|
||||||
|
|
||||||
for(int i=deviceIds.length-1; i>-1; i--) {
|
if (Build.VERSION.SDK_INT >= 16)
|
||||||
|
{
|
||||||
|
for (int i = deviceIds.length - 1; i > -1; i--) {
|
||||||
SDLHaptic haptic = getHaptic(deviceIds[i]);
|
SDLHaptic haptic = getHaptic(deviceIds[i]);
|
||||||
if (haptic == null) {
|
if (haptic == null) {
|
||||||
InputDevice device = InputDevice.getDevice(deviceIds[i]);
|
InputDevice device = InputDevice.getDevice(deviceIds[i]);
|
||||||
@ -323,12 +325,18 @@ 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);
|
||||||
if (vib != null && vib.hasVibrator()) {
|
if (vib != null) {
|
||||||
hasVibrator = true;
|
if (Build.VERSION.SDK_INT >= 11) {
|
||||||
|
hasVibratorService = vib.hasVibrator();
|
||||||
|
} else {
|
||||||
|
hasVibratorService = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (hasVibratorService) {
|
||||||
SDLHaptic haptic = getHaptic(deviceId_VIBRATOR_SERVICE);
|
SDLHaptic haptic = getHaptic(deviceId_VIBRATOR_SERVICE);
|
||||||
if (haptic == null) {
|
if (haptic == null) {
|
||||||
haptic = new SDLHaptic();
|
haptic = new SDLHaptic();
|
||||||
@ -350,7 +358,7 @@ class SDLHapticHandler {
|
|||||||
if (device_id == deviceIds[j]) break;
|
if (device_id == deviceIds[j]) break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (device_id == deviceId_VIBRATOR_SERVICE && hasVibrator) {
|
if (device_id == deviceId_VIBRATOR_SERVICE && hasVibratorService) {
|
||||||
// don't remove the vibrator if it is still present
|
// don't remove the vibrator if it is still present
|
||||||
} else if (j == deviceIds.length) {
|
} else if (j == deviceIds.length) {
|
||||||
removedDevices.add(device_id);
|
removedDevices.add(device_id);
|
||||||
|
Loading…
Reference in New Issue
Block a user