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

Commit 2d895e63 authored by Narayan Kamath's avatar Narayan Kamath Committed by Android Git Automerger
Browse files

am 8fb22ae7: am eee2c72f: Merge "Various format string fixes for 64bit" 

* commit '8fb22ae7':
  Various format string fixes for 64bit
parents 3489aa9a 8fb22ae7

core/jni/android_media_AudioRecord.cpp

+3 −2
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 


#define LOG_TAG "AudioRecord-JNI"



#include <inttypes.h>

#include <jni.h>

#include <JNIHelp.h>

#include <android_runtime/AndroidRuntime.h>
@@ -316,7 +317,7 @@ static void android_media_AudioRecord_release(JNIEnv *env, jobject thiz) { 
    if (lpRecorder == NULL) {

        return;

    }

    ALOGV("About to delete lpRecorder: %x\n", (int)lpRecorder.get());

    ALOGV("About to delete lpRecorder: %" PRIxPTR "\n", lpRecorder.get());

    lpRecorder->stop();



    audiorecord_callback_cookie *lpCookie = (audiorecord_callback_cookie *)env->GetLongField(
@@ -329,7 +330,7 @@ static void android_media_AudioRecord_release(JNIEnv *env, jobject thiz) { 
    // delete the callback information

    if (lpCookie) {

        Mutex::Autolock l(sLock);

        ALOGV("deleting lpCookie: %x\n", (int)lpCookie);

        ALOGV("deleting lpCookie: %" PRIxPTR "\n", lpCookie);

        while (lpCookie->busy) {

            if (lpCookie->cond.waitRelative(sLock,

                                            milliseconds(CALLBACK_COND_WAIT_TIMEOUT_MS)) !=

libs/androidfw/BackupHelpers.cpp

+4 −4
Original line number Diff line number Diff line
@@ -1083,7 +1083,7 @@ backup_helper_test_four() 
    }



    if (readSnapshot.size() != 4) {

        fprintf(stderr, "readSnapshot should be length 4 is %d\n", readSnapshot.size());

        fprintf(stderr, "readSnapshot should be length 4 is %zu\n", readSnapshot.size());

        return 1;

    }
@@ -1095,8 +1095,8 @@ backup_helper_test_four() 
        if (name != filenames[i] || states[i].modTime_sec != state.modTime_sec

                || states[i].modTime_nsec != state.modTime_nsec || states[i].mode != state.mode

                || states[i].size != state.size || states[i].crc32 != states[i].crc32) {

            fprintf(stderr, "state %d expected={%d/%d, 0x%08x, %04o, 0x%08x, %3d} '%s'\n"

                            "          actual={%d/%d, 0x%08x, %04o, 0x%08x, %3d} '%s'\n", i,

            fprintf(stderr, "state %zu expected={%d/%d, 0x%08x, %04o, 0x%08x, %3d} '%s'\n"

                            "          actual={%d/%d, 0x%08x, %04o, 0x%08x, %3zu} '%s'\n", i,

                    states[i].modTime_sec, states[i].modTime_nsec, states[i].mode, states[i].size,

                    states[i].crc32, name.length(), filenames[i].string(),

                    state.modTime_sec, state.modTime_nsec, state.mode, state.size, state.crc32,
@@ -1230,7 +1230,7 @@ test_read_header_and_entity(BackupDataReader& reader, const char* str) 
        goto finished;

    }

    if ((int)actualSize != bufSize) {

        fprintf(stderr, "ReadEntityHeader expected dataSize 0x%08x got 0x%08x\n", bufSize,

        fprintf(stderr, "ReadEntityHeader expected dataSize 0x%08x got 0x%08zx\n", bufSize,

                actualSize);

        err = EINVAL;

        goto finished;