commit 0c28f11e223916452186bc00e73ef92cc1134aa2
author Michael Wright <michaelwr@google.com> Wed Mar 12 21:56:24 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 12 21:56:24 2014 +0000
tree 171b4e90092ad56c455426435332bdd07034cca8
parent d105876a6c4f51199b2e24e5aa0384721cd23d0c
parent 42f2c6a92ca54ff77003ac174e0771351fbe537c

Merge "Controllers must have buttons and a movement mechanism."

services/inputflinger/EventHub.cpp

diff --git a/services/inputflinger/EventHub.cpp b/services/inputflinger/EventHub.cpp
index e2efd17..94fc0af 100644
--- a/services/inputflinger/EventHub.cpp
+++ b/services/inputflinger/EventHub.cpp
@@ -1291,7 +1291,8 @@
         device->classes |= INPUT_DEVICE_CLASS_EXTERNAL;
     }
 
-    if (device->classes & (INPUT_DEVICE_CLASS_JOYSTICK | INPUT_DEVICE_CLASS_GAMEPAD)) {
+    if (device->classes & (INPUT_DEVICE_CLASS_JOYSTICK | INPUT_DEVICE_CLASS_DPAD)
+            && device->classes & INPUT_DEVICE_CLASS_GAMEPAD) {
         device->controllerNumber = getNextControllerNumberLocked(device);
         setLedForController(device);
     }