summaryrefslogtreecommitdiffstats
path: root/libs/ui
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2010-08-10 15:47:53 -0700
committerJeff Brown <jeffbrown@google.com>2010-08-10 16:28:03 -0700
commit8d4dfd25f7329d0cdcc8dda8bdfadd7ebec3b3a4 (patch)
tree612c8b89cfedc86434c5a9532a66ac29db8d9f48 /libs/ui
parent81a5c091ca967401a354be73222f0d36360352c2 (diff)
downloadframeworks_native-8d4dfd25f7329d0cdcc8dda8bdfadd7ebec3b3a4.zip
frameworks_native-8d4dfd25f7329d0cdcc8dda8bdfadd7ebec3b3a4.tar.gz
frameworks_native-8d4dfd25f7329d0cdcc8dda8bdfadd7ebec3b3a4.tar.bz2
Fix safe mode and KeyEvent.getMaxKeyCode().
Bug: 2901731 Change-Id: I78617c1b9dee3790fc590e5af4b5083368873184
Diffstat (limited to 'libs/ui')
-rw-r--r--libs/ui/InputReader.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/libs/ui/InputReader.cpp b/libs/ui/InputReader.cpp
index 6618702..5f5a4ac 100644
--- a/libs/ui/InputReader.cpp
+++ b/libs/ui/InputReader.cpp
@@ -1080,6 +1080,14 @@ void TrackballInputMapper::applyPolicyAndDispatch(nsecs_t when, int32_t motionEv
1, & pointerId, pointerCoords, mXPrecision, mYPrecision, downTime);
}
+int32_t TrackballInputMapper::getScanCodeState(uint32_t sourceMask, int32_t scanCode) {
+ if (scanCode >= BTN_MOUSE && scanCode < BTN_JOYSTICK) {
+ return getEventHub()->getScanCodeState(getDeviceId(), scanCode);
+ } else {
+ return AKEY_STATE_UNKNOWN;
+ }
+}
+
// --- TouchInputMapper ---