diff options
| author | Glenn Kasten <gkasten@google.com> | 2014-03-31 17:19:48 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-03-31 17:19:49 +0000 |
| commit | 8bfe0555cce1213255254d2686745077e9bd4062 (patch) | |
| tree | 2f1a8b5ba0045860bb102b38cda0c90453c446b5 | |
| parent | 0df5cf5ad70dfd2085a1bec13188350697b932a2 (diff) | |
| parent | 2fbf25b50f8534c78f3b9063d35a0b5970ff8f1e (diff) | |
| download | frameworks_base-8bfe0555cce1213255254d2686745077e9bd4062.zip frameworks_base-8bfe0555cce1213255254d2686745077e9bd4062.tar.gz frameworks_base-8bfe0555cce1213255254d2686745077e9bd4062.tar.bz2 | |
Merge "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)) != |