Merge "Fixup more potential issues / warnings in string formats"

This commit is contained in:
Michael Wright 2014-06-10 20:16:08 +00:00 committed by Android (Google) Code Review
commit b37c8c5453

View File

@ -301,7 +301,7 @@ status_t InputPublisher::publishMotionEvent(
"action=0x%x, flags=0x%x, edgeFlags=0x%x, metaState=0x%x, buttonState=0x%x, " "action=0x%x, flags=0x%x, edgeFlags=0x%x, metaState=0x%x, buttonState=0x%x, "
"xOffset=%f, yOffset=%f, " "xOffset=%f, yOffset=%f, "
"xPrecision=%f, yPrecision=%f, downTime=%lld, eventTime=%lld, " "xPrecision=%f, yPrecision=%f, downTime=%lld, eventTime=%lld, "
"pointerCount=%d", "pointerCount=%" PRIu32,
mChannel->getName().string(), seq, mChannel->getName().string(), seq,
deviceId, source, action, flags, edgeFlags, metaState, buttonState, deviceId, source, action, flags, edgeFlags, metaState, buttonState,
xOffset, yOffset, xPrecision, yPrecision, downTime, eventTime, pointerCount); xOffset, yOffset, xPrecision, yPrecision, downTime, eventTime, pointerCount);
@ -313,7 +313,7 @@ status_t InputPublisher::publishMotionEvent(
} }
if (pointerCount > MAX_POINTERS || pointerCount < 1) { if (pointerCount > MAX_POINTERS || pointerCount < 1) {
ALOGE("channel '%s' publisher ~ Invalid number of pointers provided: %"PRIu32".", ALOGE("channel '%s' publisher ~ Invalid number of pointers provided: %" PRIu32 ".",
mChannel->getName().string(), pointerCount); mChannel->getName().string(), pointerCount);
return BAD_VALUE; return BAD_VALUE;
} }