Upstream version 11.39.250.0

[platform/framework/web/crosswalk.git] / src / content / public / android / java / src / org / chromium / content / browser / input / GamepadList.java

diff --git a/src/content/public/android/java/src/org/chromium/content/browser/input/GamepadList.java b/src/content/public/android/java/src/org/chromium/content/browser/input/GamepadList.java
index 272b97e..b97d1c3 100644 (file)
--- a/src/content/public/android/java/src/org/chromium/content/browser/input/GamepadList.java
+++ b/src/content/public/android/java/src/org/chromium/content/browser/input/GamepadList.java
@@ -247,6 +247,7 @@ public class GamepadList {
     }
 
     private static boolean isGamepadDevice(InputDevice inputDevice) {
+        if (inputDevice == null) return false;
         return ((inputDevice.getSources() & InputDevice.SOURCE_JOYSTICK) ==
                 InputDevice.SOURCE_JOYSTICK);
     }