diff options
| author | Michael Wright <michaelwr@google.com> | 2013-09-28 00:26:29 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-28 00:26:30 +0000 |
| commit | edb444b44419def54292cf8325c22697213153fa (patch) | |
| tree | d770e403dcef0651e52478d8772840d2e1649c27 /core | |
| parent | 9552f9b8c2bc6d671809514cb402cbc48ee2e323 (diff) | |
| parent | a977707d6e7006d11cfde045f187e777b31b9e04 (diff) | |
| download | frameworks_base-edb444b44419def54292cf8325c22697213153fa.zip frameworks_base-edb444b44419def54292cf8325c22697213153fa.tar.gz frameworks_base-edb444b44419def54292cf8325c22697213153fa.tar.bz2 | |
Merge "Add missing constructor parameter to KeyEvent" into klp-dev
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/view/ViewRootImpl.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index 38f28ae..28f7480 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -4825,8 +4825,8 @@ public final class ViewRootImpl implements ViewParent, enqueueInputEvent(new KeyEvent(event.getDownTime(), event.getEventTime(), event.getAction(), keyCode, event.getRepeatCount(), event.getMetaState(), - event.getScanCode(), event.getFlags() | KeyEvent.FLAG_FALLBACK, - event.getSource())); + event.getDeviceId(), event.getScanCode(), + event.getFlags() | KeyEvent.FLAG_FALLBACK, event.getSource())); return true; } |