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

Commit 7b84b6b6 authored by Colin Cross's avatar Colin Cross Committed by Android (Google) Code Review
Browse files

Merge "Fix logging implicit sign conversions"

parents 71ebfe44 152c3b74

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()));

        mCore->mOccupancyTracker.registerOccupancyChange(mCore->mQueue.size());

        mCore->mOccupancyTracker.registerOccupancyChange(mCore->mQueue.size());





        VALIDATE_CONSISTENCY();

        VALIDATE_CONSISTENCY();
@@ -740,7 +741,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
@@ -908,7 +908,8 @@ status_t BufferQueueProducer::queueBuffer(int slot, 
                static_cast<uint32_t>(mCore->mQueue.size()),

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

                mCore->mFrameCounter + 1);

                mCore->mFrameCounter + 1);





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

        ATRACE_INT(mCore->mConsumerName.string(),

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

        mCore->mOccupancyTracker.registerOccupancyChange(mCore->mQueue.size());

        mCore->mOccupancyTracker.registerOccupancyChange(mCore->mQueue.size());





        // Take a ticket for the callback functions

        // Take a ticket for the callback functions