diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2014-10-15 17:03:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-10-15 17:03:07 +0000 |
| commit | e67bc0c96733cee01e6f3027d9e6243f10ebbe40 (patch) | |
| tree | f7d4aa848868dbbaf72f1db04f8dcf1c368623f0 | |
| parent | e4625cc1a861615f4b3447e2a4d4990590d51470 (diff) | |
| parent | e07c9f140e1d49ca6ba55fc8e211193cce453bb4 (diff) | |
| download | frameworks_base-e67bc0c96733cee01e6f3027d9e6243f10ebbe40.zip frameworks_base-e67bc0c96733cee01e6f3027d9e6243f10ebbe40.tar.gz frameworks_base-e67bc0c96733cee01e6f3027d9e6243f10ebbe40.tar.bz2 | |
Merge "Fix log call output format error. (DO NOT MERGE)"
| -rw-r--r-- | services/jni/com_android_server_AlarmManagerService.cpp | 2 | ||||
| -rw-r--r-- | 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 a58b00bce..3d981ab 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 facd8df..3b4b4d8 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 |