Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix log call output format error. (DO NOT MERGE)"

Browse Source
This commit is contained in:
Chih-Hung Hsieh
2014-10-15 17:03:06 +00:00
committed by Gerrit Code Review
parent e4625cc1a8 e07c9f140e
commit e67bc0c967
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/jni/com_android_server_AlarmManagerService.cpp
View File

@@ -290,7 +290,7 @@ static jlong init_timerfd()
epollfd = epoll_create(N_ANDROID_TIMERFDS); epollfd = epoll_create(N_ANDROID_TIMERFDS);
if (epollfd < 0) { if (epollfd < 0) {
ALOGV("epoll_create(%u) failed: %s", N_ANDROID_TIMERFDS, ALOGV("epoll_create(%zu) failed: %s", N_ANDROID_TIMERFDS,
strerror(errno)); strerror(errno));
return 0; return 0;
} }

2
services/jni/com_android_server_input_InputManagerService.cpp
View File

@@ -1244,7 +1244,7 @@ static void nativeVibrate(JNIEnv* env,
size_t patternSize = env->GetArrayLength(patternObj); size_t patternSize = env->GetArrayLength(patternObj);
if (patternSize > MAX_VIBRATE_PATTERN_SIZE) { 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.", "which is more than the maximum supported size of %d.",
patternSize, MAX_VIBRATE_PATTERN_SIZE); patternSize, MAX_VIBRATE_PATTERN_SIZE);
return; // limit to reasonable size return; // limit to reasonable size