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

Commit 33a6d877 authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Fix logging implicit sign conversions am: 8bafabf1 

am: 6b274964

Change-Id: I22582b46e7490c3a6aae4417628a2d585fd21460
parents af06c61e 6b274964

libs/gui/BufferQueueConsumer.cpp

+4 −2
Original line number Original line Diff line number Diff line
@@ -259,7 +259,8 @@ status_t BufferQueueConsumer::acquireBuffer(BufferItem* outBuffer, 
        // decrease.

        // decrease.

        mCore->mDequeueCondition.broadcast();

        mCore->mDequeueCondition.broadcast();





        ATRACE_INT(mCore->mConsumerName.string(), mCore->mQueue.size());

        ATRACE_INT(mCore->mConsumerName.string(),

                static_cast<int32_t>(mCore->mQueue.size()));





        VALIDATE_CONSISTENCY();

        VALIDATE_CONSISTENCY();

    }

    }
@@ -726,7 +727,8 @@ void BufferQueueConsumer::dump(String8& result, const char* prefix) const { 
            "android.permission.DUMP"), pid, uid)) {

            "android.permission.DUMP"), pid, uid)) {

        result.appendFormat("Permission Denial: can't dump BufferQueueConsumer "

        result.appendFormat("Permission Denial: can't dump BufferQueueConsumer "

                "from pid=%d, uid=%d\n", pid, uid);

                "from pid=%d, uid=%d\n", pid, uid);

        android_errorWriteWithInfoLog(0x534e4554, "27046057", uid, NULL, 0);

        android_errorWriteWithInfoLog(0x534e4554, "27046057",

                static_cast<int32_t>(uid), NULL, 0);

    } else {

    } else {

        mCore->dump(result, prefix);

        mCore->dump(result, prefix);

    }

    }

libs/gui/BufferQueueProducer.cpp

+2 −1
Original line number Original line Diff line number Diff line
@@ -899,7 +899,8 @@ status_t BufferQueueProducer::queueBuffer(int slot, 
                mCore->mTransformHint,

                mCore->mTransformHint,

                static_cast<uint32_t>(mCore->mQueue.size()));

                static_cast<uint32_t>(mCore->mQueue.size()));





        ATRACE_INT(mCore->mConsumerName.string(), mCore->mQueue.size());

        ATRACE_INT(mCore->mConsumerName.string(),

                static_cast<int32_t>(mCore->mQueue.size()));





        // Take a ticket for the callback functions

        // Take a ticket for the callback functions

        callbackTicket = mNextCallbackTicket++;

        callbackTicket = mNextCallbackTicket++;