diff options
| author | Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org> | 2014-11-30 11:04:10 +0100 |
|---|---|---|
| committer | Chih-Hung Hsieh <chh@google.com> | 2014-12-05 16:14:07 -0800 |
| commit | 46c82b4cd241a447834ed2f5a6be16777b7a990b (patch) | |
| tree | afb199f10ef684e20579058a416c6d8eaa3f83e1 /core | |
| parent | 8c9283f41083a20a82ae37eac44b79de6eb3158e (diff) | |
| download | frameworks_base-46c82b4cd241a447834ed2f5a6be16777b7a990b.zip frameworks_base-46c82b4cd241a447834ed2f5a6be16777b7a990b.tar.gz frameworks_base-46c82b4cd241a447834ed2f5a6be16777b7a990b.tar.bz2 | |
Adjust format strings to work on both 32-bit and 64-bit builds
Adjust format strings to not produce Clang warnings in both 32-bit and
64-bit builds
Change-Id: I76c29d8d5d0fb4b5e9d9518077652370ffe9e871
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
Diffstat (limited to 'core')
| -rw-r--r-- | core/jni/android_view_InputEventReceiver.cpp | 6 | ||||
| -rw-r--r-- | core/jni/android_view_InputEventSender.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/core/jni/android_view_InputEventReceiver.cpp b/core/jni/android_view_InputEventReceiver.cpp index 37f5062..43b8471 100644 --- a/core/jni/android_view_InputEventReceiver.cpp +++ b/core/jni/android_view_InputEventReceiver.cpp @@ -182,7 +182,7 @@ int NativeInputEventReceiver::handleEvent(int receiveFd, int events, void* data) if (status == WOULD_BLOCK) { if (kDebugDispatchCycle) { - ALOGD("channel '%s' ~ Sent %u queued finish events; %u left.", + ALOGD("channel '%s' ~ Sent %zu queued finish events; %zu left.", getInputChannelName(), i, mFinishQueue.size()); } return 1; // keep the callback, try again later @@ -201,7 +201,7 @@ int NativeInputEventReceiver::handleEvent(int receiveFd, int events, void* data) } } if (kDebugDispatchCycle) { - ALOGD("channel '%s' ~ Sent %u queued finish events; none left.", + ALOGD("channel '%s' ~ Sent %zu queued finish events; none left.", getInputChannelName(), mFinishQueue.size()); } mFinishQueue.clear(); @@ -218,7 +218,7 @@ status_t NativeInputEventReceiver::consumeEvents(JNIEnv* env, bool consumeBatches, nsecs_t frameTime, bool* outConsumedBatch) { if (kDebugDispatchCycle) { ALOGD("channel '%s' ~ Consuming input events, consumeBatches=%s, frameTime=%lld.", - getInputChannelName(), consumeBatches ? "true" : "false", frameTime); + getInputChannelName(), consumeBatches ? "true" : "false", (long long)frameTime); } if (consumeBatches) { diff --git a/core/jni/android_view_InputEventSender.cpp b/core/jni/android_view_InputEventSender.cpp index e7388cf..265daeb 100644 --- a/core/jni/android_view_InputEventSender.cpp +++ b/core/jni/android_view_InputEventSender.cpp @@ -204,7 +204,7 @@ status_t NativeInputEventSender::receiveFinishedSignals(JNIEnv* env) { if (kDebugDispatchCycle) { ALOGD("channel '%s' ~ Received finished signal, seq=%u, handled=%s, " - "pendingEvents=%u.", + "pendingEvents=%zu.", getInputChannelName(), seq, handled ? "true" : "false", mPublishedSeqMap.size()); } |