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

Commit b0dd6d3a authored by Chih-hung Hsieh's avatar Chih-hung Hsieh Committed by Android Git Automerger
Browse files

am 4c23a0ec: Merge "Adjust format strings to work on both 32-bit and 64-bit builds" 

* commit '4c23a0ec':
  Adjust format strings to work on both 32-bit and 64-bit builds
parents bc59ca4b 4c23a0ec

cmds/idmap/scan.cpp

+2 −2
Original line number Diff line number Diff line
@@ -146,13 +146,13 @@ namespace { 
        }

        char *buf = new char[uncompLen];

        if (NULL == buf) {

            ALOGW("%s: failed to allocate %d byte\n", __FUNCTION__, uncompLen);

            ALOGW("%s: failed to allocate %zd byte\n", __FUNCTION__, uncompLen);

            dataMap->release();

            return -1;

        }

        StreamingZipInflater inflater(dataMap, uncompLen);

        if (inflater.read(buf, uncompLen) < 0) {

            ALOGW("%s: failed to inflate %d byte\n", __FUNCTION__, uncompLen);

            ALOGW("%s: failed to inflate %zd byte\n", __FUNCTION__, uncompLen);

            delete[] buf;

            dataMap->release();

            return -1;

core/jni/android_view_InputEventReceiver.cpp

+3 −3
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ int NativeInputEventReceiver::handleEvent(int receiveFd, int events, void* data) 


                if (status == WOULD_BLOCK) {

                    if (kDebugDispatchCycle) {

                        ALOGD("channel '%s' ~ Sent %u queued finish events; %u left.",

                        ALOGD("channel '%s' ~ Sent %zu queued finish events; %zu left.",

                                getInputChannelName(), i, mFinishQueue.size());

                    }

                    return 1; // keep the callback, try again later
@@ -201,7 +201,7 @@ int NativeInputEventReceiver::handleEvent(int receiveFd, int events, void* data) 
            }

        }

        if (kDebugDispatchCycle) {

            ALOGD("channel '%s' ~ Sent %u queued finish events; none left.",

            ALOGD("channel '%s' ~ Sent %zu queued finish events; none left.",

                    getInputChannelName(), mFinishQueue.size());

        }

        mFinishQueue.clear();
@@ -218,7 +218,7 @@ status_t NativeInputEventReceiver::consumeEvents(JNIEnv* env, 
        bool consumeBatches, nsecs_t frameTime, bool* outConsumedBatch) {

    if (kDebugDispatchCycle) {

        ALOGD("channel '%s' ~ Consuming input events, consumeBatches=%s, frameTime=%lld.",

                getInputChannelName(), consumeBatches ? "true" : "false", frameTime);

                getInputChannelName(), consumeBatches ? "true" : "false", (long long)frameTime);

    }



    if (consumeBatches) {

core/jni/android_view_InputEventSender.cpp

+1 −1
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ status_t NativeInputEventSender::receiveFinishedSignals(JNIEnv* env) { 


            if (kDebugDispatchCycle) {

                ALOGD("channel '%s' ~ Received finished signal, seq=%u, handled=%s, "

                        "pendingEvents=%u.",

                        "pendingEvents=%zu.",

                        getInputChannelName(), seq, handled ? "true" : "false",

                        mPublishedSeqMap.size());

            }

media/jni/android_media_MediaExtractor.cpp

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ class JavaDataSourceBridge : public DataSource { 
        env->GetByteArrayRegion(byteArrayObj, 0, size, (jbyte*) buffer);

        env->DeleteLocalRef(byteArrayObj);

        if (env->ExceptionCheck()) {

            ALOGW("Exception occurred while reading %zu at %lld", size, offset);

            ALOGW("Exception occurred while reading %zu at %lld", size, (long long)offset);

            LOGW_EX(env);

            env->ExceptionClear();

            return -1;

media/jni/android_media_MediaMetadataRetriever.cpp

+1 −1
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ static void rotate(T *dst, const T *src, size_t width, size_t height, int angle) 


static jobject android_media_MediaMetadataRetriever_getFrameAtTime(JNIEnv *env, jobject thiz, jlong timeUs, jint option)

{

    ALOGV("getFrameAtTime: %lld us option: %d", timeUs, option);

    ALOGV("getFrameAtTime: %lld us option: %d", (long long)timeUs, option);

    MediaMetadataRetriever* retriever = getRetriever(env, thiz);

    if (retriever == 0) {

        jniThrowException(env, "java/lang/IllegalStateException", "No retriever available");