diff options
| author | 2014-03-27 12:50:58 +0000 | |
|---|---|---|
| committer | 2014-03-27 12:50:58 +0000 | |
| commit | 22d074643ed0d010ebfdb0fca685d65eb2632e58 (patch) | |
| tree | 46ed3de2ff7e9e33f5d5cc0861fa4e052fdc58e7 /libs/input/InputReader.cpp | |
| parent | 68d43e275efae8f7b83388ea6fdebbcf5cd1504f (diff) | |
| parent | eaab4df0ddadf313ab6b3c832896003968525091 (diff) | |
resolved conflicts for merge of eaab4df0 to klp-modular-dev-plus-aosp
Change-Id: I871431e5a3ce45a33563ced845e044d37471689b
Diffstat (limited to 'libs/input/InputReader.cpp')
| -rw-r--r-- | libs/input/InputReader.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libs/input/InputReader.cpp b/libs/input/InputReader.cpp index 48c5223dd415..a4093e9bdc28 100644 --- a/libs/input/InputReader.cpp +++ b/libs/input/InputReader.cpp @@ -1992,7 +1992,7 @@ 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); } @@ -3389,7 +3389,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, @@ -6132,8 +6132,8 @@ void MultiTouchInputMapper::configureRawPointerAxes() { && mRawPointerAxes.slot.minValue == 0 && mRawPointerAxes.slot.maxValue > 0) { size_t slotCount = mRawPointerAxes.slot.maxValue + 1; if (slotCount > MAX_SLOTS) { - ALOGW("MultiTouch Device %s reported %d slots but the framework " - "only supports a maximum of %d slots at this time.", + ALOGW("MultiTouch Device %s reported %zu slots but the framework " + "only supports a maximum of %zu slots at this time.", getDeviceName().string(), slotCount, MAX_SLOTS); slotCount = MAX_SLOTS; } @@ -6305,7 +6305,7 @@ void JoystickInputMapper::configure(nsecs_t when, // If there are too many axes, start dropping them. // Prefer to keep explicitly mapped axes. if (mAxes.size() > PointerCoords::MAX_AXES) { - ALOGI("Joystick '%s' has %d axes but the framework only supports a maximum of %d.", + ALOGI("Joystick '%s' has %zu axes but the framework only supports a maximum of %d.", getDeviceName().string(), mAxes.size(), PointerCoords::MAX_AXES); pruneAxes(true); pruneAxes(false); |