Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am d23d916e: Merge "Controllers must have buttons and a movement mechanism." into klp-modular-dev

Browse Source 
* commit 'd23d916e0fc573ccde8a622aaa42ccfae9d31f82':
  Controllers must have buttons and a movement mechanism.
This commit is contained in:
Michael Wright
2014-03-13 00:40:03 +00:00
committed by Android Git Automerger
parent 306c46884e d23d916e0f
commit f80f60ba2b
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libs/input/EventHub.cpp
View File

@@ -1305,7 +1305,8 @@ status_t EventHub::openDeviceLocked(const char *devicePath) {
device->classes |= INPUT_DEVICE_CLASS_EXTERNAL; 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); device->controllerNumber = getNextControllerNumberLocked(device);
setLedForController(device); setLedForController(device);
} }