diff options
| author | Steve Kondik <steve@cyngn.com> | 2015-12-07 17:07:16 -0800 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2015-12-07 17:07:16 -0800 |
| commit | 4951bcc16e99daafc44581e4222f012f9d419ae0 (patch) | |
| tree | 7be00878227a20b4610649a7d455db2d9cb3463c /services/inputflinger/InputReader.h | |
| parent | 53602ffde5527c476a1d7d39da12ecd7f58917f4 (diff) | |
| parent | a78c2e65e13cace4fdbb0295beca5b11de9fde06 (diff) | |
| download | frameworks_native-4951bcc16e99daafc44581e4222f012f9d419ae0.zip frameworks_native-4951bcc16e99daafc44581e4222f012f9d419ae0.tar.gz frameworks_native-4951bcc16e99daafc44581e4222f012f9d419ae0.tar.bz2 | |
Merge tag 'android-6.0.1_r3' of https://android.googlesource.com/platform/frameworks/native into cm-13.0
Android 6.0.1 release 3
Change-Id: I437aaf148d440a8144afe1454948980fc3b40cca
Diffstat (limited to 'services/inputflinger/InputReader.h')
| -rw-r--r-- | services/inputflinger/InputReader.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/services/inputflinger/InputReader.h b/services/inputflinger/InputReader.h index 9a46fb8..e480350 100644 --- a/services/inputflinger/InputReader.h +++ b/services/inputflinger/InputReader.h @@ -1175,8 +1175,7 @@ private: bool isKeyboardOrGamepadKey(int32_t scanCode); - void processKey(nsecs_t when, bool down, int32_t keyCode, int32_t scanCode, - uint32_t policyFlags); + void processKey(nsecs_t when, bool down, int32_t scanCode, int32_t usageCode); ssize_t findKeyDown(int32_t scanCode); |