Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a30df721 authored by Glenn Kasten's avatar Glenn Kasten Committed by Android Git Automerger
Browse files

am 8bfe0555: Merge "Fix warnings" 

* commit '8bfe0555':
  Fix warnings
parents f24c5e4c 8bfe0555

core/jni/android_hardware_Camera.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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) {

core/jni/android_media_AudioRecord.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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)) !=