Index: content/public/android/java/src/org/chromium/content/browser/input/GamepadList.java |
diff --git a/content/public/android/java/src/org/chromium/content/browser/input/GamepadList.java b/content/public/android/java/src/org/chromium/content/browser/input/GamepadList.java |
index 272b97edb34f23ffe19abfc8a4c2497a957c57bb..b97d1c326ec650ec0cf0e2af90d25477633a925b 100644 |
--- a/content/public/android/java/src/org/chromium/content/browser/input/GamepadList.java |
+++ b/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); |
} |