summaryrefslogtreecommitdiffstats
path: root/libs/ui
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2010-10-10 12:53:39 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-10 12:53:39 -0700
commit4475c0edcc35b283a16c9b27033c8e83d8cf1496 (patch)
tree7fdd8129eacd267cb7d02636744b7fedea917310 /libs/ui
parent02611a728036b283c1d46612a124498eebe8a840 (diff)
parentf10929fb350395c21edd2cba7641479afe75e750 (diff)
downloadframeworks_base-4475c0edcc35b283a16c9b27033c8e83d8cf1496.zip
frameworks_base-4475c0edcc35b283a16c9b27033c8e83d8cf1496.tar.gz
frameworks_base-4475c0edcc35b283a16c9b27033c8e83d8cf1496.tar.bz2
am f10929fb: am a1bf0a06: Merge "Minor fix for InputReader support for non-touchscreen devices." into gingerbread
Merge commit 'f10929fb350395c21edd2cba7641479afe75e750' * commit 'f10929fb350395c21edd2cba7641479afe75e750': Minor fix for InputReader support for non-touchscreen devices.
Diffstat (limited to 'libs/ui')
-rw-r--r--libs/ui/InputReader.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/ui/InputReader.cpp b/libs/ui/InputReader.cpp
index 8e173aa..7adc764 100644
--- a/libs/ui/InputReader.cpp
+++ b/libs/ui/InputReader.cpp
@@ -2447,7 +2447,7 @@ void TouchInputMapper::dispatchTouch(nsecs_t when, uint32_t policyFlags,
yPrecision = mLocked.orientedYPrecision;
} // release lock
- getDispatcher()->notifyMotion(when, getDeviceId(), AINPUT_SOURCE_TOUCHSCREEN, policyFlags,
+ getDispatcher()->notifyMotion(when, getDeviceId(), getSources(), policyFlags,
motionEventAction, 0, getContext()->getGlobalMetaState(), motionEventEdgeFlags,
pointerCount, pointerIds, pointerCoords,
xPrecision, yPrecision, mDownTime);