moonlight-stream/moonlight-android
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-android.git synced 2026-04-17 14:00:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix possible rumble crash if only the lower motor byte is non-zero

Browse Source
This commit is contained in:
Cameron Gutman
2021-07-16 19:25:10 -05:00
parent 27ffbd8dec
commit f2bf168925
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/com/limelight/binding/input/ControllerHandler.java
View File

@@ -1311,6 +1311,11 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
// This must only be called if hasDualAmplitudeControlledRumbleVibrators() is true! // This must only be called if hasDualAmplitudeControlledRumbleVibrators() is true!
@TargetApi(31) @TargetApi(31)
private void rumbleDualVibrators(VibratorManager vm, short lowFreqMotor, short highFreqMotor) { private void rumbleDualVibrators(VibratorManager vm, short lowFreqMotor, short highFreqMotor) {
// Normalize motor values to 0-255 amplitudes for VibrationManager
highFreqMotor = (short)((highFreqMotor >> 8) & 0xFF);
lowFreqMotor = (short)((lowFreqMotor >> 8) & 0xFF);
// If they're both zero, we can just call cancel().
if (lowFreqMotor == 0 && highFreqMotor == 0) { if (lowFreqMotor == 0 && highFreqMotor == 0) {
vm.cancel(); vm.cancel();
return; return;
@@ -1320,7 +1325,7 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
// always be enumerated in this order, but it seems consistent between Xbox Series X (USB), // always be enumerated in this order, but it seems consistent between Xbox Series X (USB),
// PS3 (USB), and PS4 (USB+BT) controllers on Android 12 Beta 3. // PS3 (USB), and PS4 (USB+BT) controllers on Android 12 Beta 3.
int[] vibratorIds = vm.getVibratorIds(); int[] vibratorIds = vm.getVibratorIds();
int[] vibratorAmplitudes = new int[] { (highFreqMotor >> 8) & 0xFF, (lowFreqMotor >> 8) & 0xFF }; int[] vibratorAmplitudes = new int[] { highFreqMotor, lowFreqMotor };
CombinedVibration.ParallelCombination combo = CombinedVibration.startParallel(); CombinedVibration.ParallelCombination combo = CombinedVibration.startParallel();