sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix issue with onPause trying to cancel vibration when user has not defined Vibration Service permission in manifest.

Browse Source 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9716 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
iwg..ic 2012-09-11 03:30:18 +00:00
parent 5a71423624
commit d2b97fb422
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
engine/src/android/com/jme3/input/android/AndroidSensorJoyInput.java
View File

@ -87,6 +87,7 @@ public class AndroidSensorJoyInput implements JoyInput, SensorEventListener {
private InputManager inputManager = null; private InputManager inputManager = null;
private SensorManager sensorManager = null; private SensorManager sensorManager = null;
private Vibrator vibrator = null; private Vibrator vibrator = null;
private boolean vibratorActive = false;
private long maxRumbleTime = 250; // 250ms private long maxRumbleTime = 250; // 250ms
private RawInputListener listener = null; private RawInputListener listener = null;
private IntMap<SensorData> sensors = new IntMap<SensorData>(); private IntMap<SensorData> sensors = new IntMap<SensorData>();
@ -299,7 +300,7 @@ public class AndroidSensorJoyInput implements JoyInput, SensorEventListener {
for (Entry entry: sensors) { for (Entry entry: sensors) {
unRegisterListener(entry.getKey()); unRegisterListener(entry.getKey());
} }
if (vibrator != null) { if (vibrator != null && vibratorActive) {
vibrator.cancel(); vibrator.cancel();
} }
} }
@ -546,8 +547,10 @@ public class AndroidSensorJoyInput implements JoyInput, SensorEventListener {
if (rumbleOnDur > 0) { if (rumbleOnDur > 0) {
vibrator.vibrate(rumblePattern, rumbleRepeatFrom); vibrator.vibrate(rumblePattern, rumbleRepeatFrom);
vibratorActive = true;
} else { } else {
vibrator.cancel(); vibrator.cancel();
vibratorActive = false;
} }
} }