summaryrefslogtreecommitdiffstats
path: root/services/core
diff options
context:
space:
mode:
authorMichael Wright <michaelwr@google.com>2014-04-04 23:51:36 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-04-04 23:51:36 +0000
commit118d113478a2c58e7997f926a8dd1bc5ca5f5dc8 (patch)
tree96ba9529a7bdefecf77a46d194174490768ac52a /services/core
parent55e86a78a6656ef5a99f7b5df59c7eeedd34148a (diff)
parent9ecba5269b1e114439f4515a433d73d450f04769 (diff)
downloadframeworks_base-118d113478a2c58e7997f926a8dd1bc5ca5f5dc8.zip
frameworks_base-118d113478a2c58e7997f926a8dd1bc5ca5f5dc8.tar.gz
frameworks_base-118d113478a2c58e7997f926a8dd1bc5ca5f5dc8.tar.bz2
Merge "Fix size_t format specifier"
Diffstat (limited to 'services/core')
-rw-r--r--services/core/jni/com_android_server_input_InputManagerService.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/jni/com_android_server_input_InputManagerService.cpp b/services/core/jni/com_android_server_input_InputManagerService.cpp
index 08d6ca6..b3247ff 100644
--- a/services/core/jni/com_android_server_input_InputManagerService.cpp
+++ b/services/core/jni/com_android_server_input_InputManagerService.cpp
@@ -1297,7 +1297,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 %zu "
"which is more than the maximum supported size of %d.",
patternSize, MAX_VIBRATE_PATTERN_SIZE);
return; // limit to reasonable size