Prevent NPE for unknown device

CID #1270883

Prevent NPE for unknown device
CID #1270883
75922427 · Geoffrey Métais · b67e407c · 75922427
Commit 75922427 authored Feb 18, 2015 by Geoffrey Métais
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

vlc-android/tv/src/org/videolan/vlc/gui/tv/audioplayer/AudioPlayerActivity.java .../videolan/vlc/gui/tv/audioplayer/AudioPlayerActivity.java +5 -2

No files found.
--- a/vlc-android/tv/src/org/videolan/vlc/gui/tv/audioplayer/AudioPlayerActivity.java
+++ b/vlc-android/tv/src/org/videolan/vlc/gui/tv/audioplayer/AudioPlayerActivity.java
@@ -201,9 +201,12 @@ public class AudioPlayerActivity extends Activity implements AudioServiceControl

    public boolean dispatchGenericMotionEvent(MotionEvent event){

-        InputDevice mInputDevice = event.getDevice();
+        InputDevice inputDevice = event.getDevice();

-        float x = AndroidDevices.getCenteredAxis(event, mInputDevice,
+        if (inputDevice == null)
+            return false;
+
+        float x = AndroidDevices.getCenteredAxis(event, inputDevice,
                MotionEvent.AXIS_X);

        if (System.currentTimeMillis() - mLastMove > JOYSTICK_INPUT_DELAY){