diff options
| author | Dan Albert <danalbert@google.com> | 2015-06-11 00:53:25 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-11 00:53:27 +0000 |
| commit | fb48b0142467b9edac7dd9cc4322234aafc754b3 (patch) | |
| tree | 57a81983b70cb4f89437aef6645dacf0c7d7294f /media/jni | |
| parent | 7ce0d25b0d864c45766ab93775211bc7f782c992 (diff) | |
| parent | 1102e21b5dd0f79072e826932d0a3e3cb2f8c285 (diff) | |
| download | frameworks_base-fb48b0142467b9edac7dd9cc4322234aafc754b3.zip frameworks_base-fb48b0142467b9edac7dd9cc4322234aafc754b3.tar.gz frameworks_base-fb48b0142467b9edac7dd9cc4322234aafc754b3.tar.bz2 | |
Merge "Fix format string mismatch. Clang build fix." into mnc-dev
Diffstat (limited to 'media/jni')
| -rw-r--r-- | media/jni/android_media_ImageWriter.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/media/jni/android_media_ImageWriter.cpp b/media/jni/android_media_ImageWriter.cpp index 294cd84..634ba64 100644 --- a/media/jni/android_media_ImageWriter.cpp +++ b/media/jni/android_media_ImageWriter.cpp @@ -293,7 +293,8 @@ static jlong ImageWriter_init(JNIEnv* env, jobject thiz, jobject weakThiz, jobje res = native_window_set_usage(anw.get(), GRALLOC_USAGE_SW_WRITE_OFTEN); if (res != OK) { ALOGE("%s: Configure usage %08x for format %08x failed: %s (%d)", - __FUNCTION__, GRALLOC_USAGE_SW_WRITE_OFTEN, format, strerror(-res), res); + __FUNCTION__, static_cast<unsigned int>(GRALLOC_USAGE_SW_WRITE_OFTEN), + format, strerror(-res), res); jniThrowRuntimeException(env, "Failed to SW_WRITE_OFTEN configure usage"); return 0; } |