summaryrefslogtreecommitdiffstats
path: root/services/inputflinger/InputReader.cpp
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@google.com>2014-03-18 10:59:23 -0700
committerMark Salyzyn <salyzyn@google.com>2014-03-21 15:34:51 -0700
commit41d2f80739700a56fd6a670923a2966add8dae61 (patch)
tree111cc9871ff6559325caeae84d42fda4cff19cfc /services/inputflinger/InputReader.cpp
parent0a32461524f55697cdc49baa5c26c95839f4b52a (diff)
downloadframeworks_native-41d2f80739700a56fd6a670923a2966add8dae61.zip
frameworks_native-41d2f80739700a56fd6a670923a2966add8dae61.tar.gz
frameworks_native-41d2f80739700a56fd6a670923a2966add8dae61.tar.bz2
inputflinger: 64 bit compile issues
Change-Id: I73c37eb19b28d987ff13632a999e71d6c96cc3e0
Diffstat (limited to 'services/inputflinger/InputReader.cpp')
-rw-r--r--services/inputflinger/InputReader.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/services/inputflinger/InputReader.cpp b/services/inputflinger/InputReader.cpp
index e99f762..66f907a 100644
--- a/services/inputflinger/InputReader.cpp
+++ b/services/inputflinger/InputReader.cpp
@@ -2003,9 +2003,9 @@ void KeyboardInputMapper::dump(String8& dump) {
dumpParameters(dump);
dump.appendFormat(INDENT3 "KeyboardType: %d\n", mKeyboardType);
dump.appendFormat(INDENT3 "Orientation: %d\n", mOrientation);
- dump.appendFormat(INDENT3 "KeyDowns: %d keys currently down\n", mKeyDowns.size());
+ dump.appendFormat(INDENT3 "KeyDowns: %zu keys currently down\n", mKeyDowns.size());
dump.appendFormat(INDENT3 "MetaState: 0x%0x\n", mMetaState);
- dump.appendFormat(INDENT3 "DownTime: %lld\n", mDownTime);
+ dump.appendFormat(INDENT3 "DownTime: %lld\n", (long long)mDownTime);
}
@@ -2303,7 +2303,7 @@ void CursorInputMapper::dump(String8& dump) {
dump.appendFormat(INDENT3 "Orientation: %d\n", mOrientation);
dump.appendFormat(INDENT3 "ButtonState: 0x%08x\n", mButtonState);
dump.appendFormat(INDENT3 "Down: %s\n", toString(isPointerDown(mButtonState)));
- dump.appendFormat(INDENT3 "DownTime: %lld\n", mDownTime);
+ dump.appendFormat(INDENT3 "DownTime: %lld\n", (long long)mDownTime);
}
void CursorInputMapper::configure(nsecs_t when,
@@ -3409,7 +3409,7 @@ void TouchInputMapper::dumpVirtualKeys(String8& dump) {
for (size_t i = 0; i < mVirtualKeys.size(); i++) {
const VirtualKey& virtualKey = mVirtualKeys.itemAt(i);
- dump.appendFormat(INDENT4 "%d: scanCode=%d, keyCode=%d, "
+ dump.appendFormat(INDENT4 "%zu: scanCode=%d, keyCode=%d, "
"hitLeft=%d, hitRight=%d, hitTop=%d, hitBottom=%d\n",
i, virtualKey.scanCode, virtualKey.keyCode,
virtualKey.hitLeft, virtualKey.hitRight,