diff options
| author | Glenn Kasten <gkasten@google.com> | 2014-03-31 17:22:46 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-31 17:22:46 +0000 |
| commit | 75e1341f890e81135eb8706c4ec362d30a6af375 (patch) | |
| tree | 519dd40cdd74914d990e4fffda43d7211e82b59f | |
| parent | f6008fec7b1233685c2fd2b8506562cde26be473 (diff) | |
| parent | 8bfe0555cce1213255254d2686745077e9bd4062 (diff) | |
| download | frameworks_base-75e1341f890e81135eb8706c4ec362d30a6af375.zip frameworks_base-75e1341f890e81135eb8706c4ec362d30a6af375.tar.gz frameworks_base-75e1341f890e81135eb8706c4ec362d30a6af375.tar.bz2 | |
am 8bfe0555: Merge "Fix warnings"
* commit '8bfe0555cce1213255254d2686745077e9bd4062':
Fix warnings
| -rw-r--r-- | core/jni/android_hardware_Camera.cpp | 2 | ||||
| -rw-r--r-- | core/jni/android_media_AudioRecord.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/jni/android_hardware_Camera.cpp b/core/jni/android_hardware_Camera.cpp index 58b61ba..307293f 100644 --- a/core/jni/android_hardware_Camera.cpp +++ b/core/jni/android_hardware_Camera.cpp @@ -230,7 +230,7 @@ void JNICameraContext::copyAndPost(JNIEnv* env, const sp<IMemory>& dataPtr, int ssize_t offset; size_t size; sp<IMemoryHeap> heap = dataPtr->getMemory(&offset, &size); - ALOGV("copyAndPost: off=%ld, size=%d", offset, size); + ALOGV("copyAndPost: off=%zd, size=%zu", offset, size); uint8_t *heapBase = (uint8_t*)heap->base(); if (heapBase != NULL) { diff --git a/core/jni/android_media_AudioRecord.cpp b/core/jni/android_media_AudioRecord.cpp index 0132b5f..cd0bf53 100644 --- a/core/jni/android_media_AudioRecord.cpp +++ b/core/jni/android_media_AudioRecord.cpp @@ -312,7 +312,7 @@ static void android_media_AudioRecord_release(JNIEnv *env, jobject thiz) { if (lpRecorder == NULL) { return; } - ALOGV("About to delete lpRecorder: %" PRIxPTR "\n", lpRecorder.get()); + ALOGV("About to delete lpRecorder: %p", lpRecorder.get()); lpRecorder->stop(); audiorecord_callback_cookie *lpCookie = (audiorecord_callback_cookie *)env->GetLongField( @@ -325,7 +325,7 @@ static void android_media_AudioRecord_release(JNIEnv *env, jobject thiz) { // delete the callback information if (lpCookie) { Mutex::Autolock l(sLock); - ALOGV("deleting lpCookie: %" PRIxPTR "\n", lpCookie); + ALOGV("deleting lpCookie: %p", lpCookie); while (lpCookie->busy) { if (lpCookie->cond.waitRelative(sLock, milliseconds(CALLBACK_COND_WAIT_TIMEOUT_MS)) != |