diff options
| author | Michael Wright <michaelwr@google.com> | 2013-04-05 21:43:31 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-05 21:43:31 +0000 |
| commit | bdb706e48d71af498156efbb10d0f0c1fcef8878 (patch) | |
| tree | d7fc1d7057e9055fa23d1c49adcdbe7dd34799c3 /core/jni | |
| parent | 8299f683f3fbe7ba0f5387b062b31de117882dba (diff) | |
| parent | c6091c64c90e9557ea58e0d7cf75915aea7c6c3e (diff) | |
| download | frameworks_base-bdb706e48d71af498156efbb10d0f0c1fcef8878.zip frameworks_base-bdb706e48d71af498156efbb10d0f0c1fcef8878.tar.gz frameworks_base-bdb706e48d71af498156efbb10d0f0c1fcef8878.tar.bz2 | |
Merge "Pipe through device resolution information" into jb-mr2-dev
Diffstat (limited to 'core/jni')
| -rw-r--r-- | core/jni/android_view_InputDevice.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/jni/android_view_InputDevice.cpp b/core/jni/android_view_InputDevice.cpp index 576f831..e3a54a8 100644 --- a/core/jni/android_view_InputDevice.cpp +++ b/core/jni/android_view_InputDevice.cpp @@ -62,8 +62,8 @@ jobject android_view_InputDevice_create(JNIEnv* env, const InputDeviceInfo& devi const Vector<InputDeviceInfo::MotionRange>& ranges = deviceInfo.getMotionRanges(); for (size_t i = 0; i < ranges.size(); i++) { const InputDeviceInfo::MotionRange& range = ranges.itemAt(i); - env->CallVoidMethod(inputDeviceObj.get(), gInputDeviceClassInfo.addMotionRange, - range.axis, range.source, range.min, range.max, range.flat, range.fuzz); + env->CallVoidMethod(inputDeviceObj.get(), gInputDeviceClassInfo.addMotionRange, range.axis, + range.source, range.min, range.max, range.flat, range.fuzz, range.resolution); if (env->ExceptionCheck()) { return NULL; } @@ -90,7 +90,7 @@ int register_android_view_InputDevice(JNIEnv* env) "<init>", "(IILjava/lang/String;Ljava/lang/String;ZIILandroid/view/KeyCharacterMap;Z)V"); GET_METHOD_ID(gInputDeviceClassInfo.addMotionRange, gInputDeviceClassInfo.clazz, - "addMotionRange", "(IIFFFF)V"); + "addMotionRange", "(IIFFFFF)V"); return 0; } |