summaryrefslogtreecommitdiffstats
path: root/libs
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
commitc3fc2d03d58a258c53c9265a70143d4af076b764 (patch)
tree762de411088b9854a766fbe382235bd6fa913df1 /libs
parentd98d0fc6e9172d3f130794e499462c911920adf6 (diff)
downloadframeworks_base-c3fc2d03d58a258c53c9265a70143d4af076b764.zip
frameworks_base-c3fc2d03d58a258c53c9265a70143d4af076b764.tar.gz
frameworks_base-c3fc2d03d58a258c53c9265a70143d4af076b764.tar.bz2
Fix safe mode and KeyEvent.getMaxKeyCode().
Bug: 2901731 Change-Id: I78617c1b9dee3790fc590e5af4b5083368873184
Diffstat (limited to 'libs')
-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 ---