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

Merge "Fix warnings"

Browse Source
This commit is contained in:
Glenn Kasten
2014-03-31 17:19:48 +00:00
committed by Android (Google) Code Review
parent 0df5cf5ad7 2fbf25b50f
commit 8bfe0555cc
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/jni/android_hardware_Camera.cpp
View File

@@ -230,7 +230,7 @@ void JNICameraContext::copyAndPost(JNIEnv* env, const sp<IMemory>& dataPtr, int
ssize_t offset; ssize_t offset;
size_t size; size_t size;
sp<IMemoryHeap> heap = dataPtr->getMemory(&offset, &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(); uint8_t *heapBase = (uint8_t*)heap->base();
if (heapBase != NULL) { if (heapBase != NULL) {

4
core/jni/android_media_AudioRecord.cpp
View File

@@ -312,7 +312,7 @@ static void android_media_AudioRecord_release(JNIEnv *env, jobject thiz) {
if (lpRecorder == NULL) { if (lpRecorder == NULL) {
return; return;
} }
ALOGV("About to delete lpRecorder: %" PRIxPTR "\n", lpRecorder.get()); ALOGV("About to delete lpRecorder: %p", lpRecorder.get());
lpRecorder->stop(); lpRecorder->stop();
audiorecord_callback_cookie *lpCookie = (audiorecord_callback_cookie *)env->GetLongField( 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 // delete the callback information
if (lpCookie) { if (lpCookie) {
Mutex::Autolock l(sLock); Mutex::Autolock l(sLock);
ALOGV("deleting lpCookie: %" PRIxPTR "\n", lpCookie); ALOGV("deleting lpCookie: %p", lpCookie);
while (lpCookie->busy) { while (lpCookie->busy) {
if (lpCookie->cond.waitRelative(sLock, if (lpCookie->cond.waitRelative(sLock,
milliseconds(CALLBACK_COND_WAIT_TIMEOUT_MS)) != milliseconds(CALLBACK_COND_WAIT_TIMEOUT_MS)) !=