From e07c9f140e1d49ca6ba55fc8e211193cce453bb4 Mon Sep 17 00:00:00 2001 From: Chih-Hung Hsieh Date: Wed, 8 Oct 2014 10:50:23 -0700 Subject: [PATCH] Fix log call output format error. (DO NOT MERGE) Cherry picked from googleplex-android c/445200. BUG: 17916851 Change-Id: If4077e94d6dc7ef31ecf09cbcf41091c7e30268f --- services/jni/com_android_server_AlarmManagerService.cpp | 2 +- services/jni/com_android_server_input_InputManagerService.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/services/jni/com_android_server_AlarmManagerService.cpp b/services/jni/com_android_server_AlarmManagerService.cpp index a58b00bced59d..3d981abf5ff05 100644 --- a/services/jni/com_android_server_AlarmManagerService.cpp +++ b/services/jni/com_android_server_AlarmManagerService.cpp @@ -290,7 +290,7 @@ static jlong init_timerfd() epollfd = epoll_create(N_ANDROID_TIMERFDS); if (epollfd < 0) { - ALOGV("epoll_create(%u) failed: %s", N_ANDROID_TIMERFDS, + ALOGV("epoll_create(%zu) failed: %s", N_ANDROID_TIMERFDS, strerror(errno)); return 0; } diff --git a/services/jni/com_android_server_input_InputManagerService.cpp b/services/jni/com_android_server_input_InputManagerService.cpp index facd8df6b4782..3b4b4d8fc5cdc 100644 --- a/services/jni/com_android_server_input_InputManagerService.cpp +++ b/services/jni/com_android_server_input_InputManagerService.cpp @@ -1244,7 +1244,7 @@ static void nativeVibrate(JNIEnv* env, size_t patternSize = env->GetArrayLength(patternObj); if (patternSize > MAX_VIBRATE_PATTERN_SIZE) { - ALOGI("Skipped requested vibration because the pattern size is %d " + ALOGI("Skipped requested vibration because the pattern size is %zd " "which is more than the maximum supported size of %d.", patternSize, MAX_VIBRATE_PATTERN_SIZE); return; // limit to reasonable size