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

Commit dd3f8634 authored by Colin Cross's avatar Colin Cross Committed by Gerrit Code Review
Browse files

Merge changes I2ce11db5,Idba8278b 

* changes:
  Fix logging implicit sign conversions
  Fix libgui warnings
parents 2b23374b 8bafabf1

include/gui/BufferQueueCore.h

+2 −2
Original line number Diff line number Diff line
@@ -305,8 +305,8 @@ private: 


    // Cached data about the shared buffer in shared buffer mode

    struct SharedBufferCache {

        SharedBufferCache(Rect _crop, uint32_t _transform, int _scalingMode,

                android_dataspace _dataspace)

        SharedBufferCache(Rect _crop, uint32_t _transform,

                uint32_t _scalingMode, android_dataspace _dataspace)

        : crop(_crop),

          transform(_transform),

          scalingMode(_scalingMode),

include/gui/IGraphicBufferProducer.h

+1 −1
Original line number Diff line number Diff line
@@ -350,7 +350,7 @@ public: 
    };



    // QueueBufferOutput must be a POD structure

    struct __attribute__ ((__packed__)) QueueBufferOutput {

    struct QueueBufferOutput {

        inline QueueBufferOutput() { }

        // outWidth - filled with default width applied to the buffer

        // outHeight - filled with default height applied to the buffer

libs/gui/BufferQueueConsumer.cpp

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

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

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

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

                "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 {

        mCore->dump(result, prefix);

    }

libs/gui/BufferQueueProducer.cpp

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

                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

        callbackTicket = mNextCallbackTicket++;

libs/gui/Surface.cpp

+1 −1
Original line number Diff line number Diff line
@@ -371,7 +371,7 @@ int Surface::queueBuffer(android_native_buffer_t* buffer, int fenceFd) { 
        timestamp = systemTime(SYSTEM_TIME_MONOTONIC);

        isAutoTimestamp = true;

        ALOGV("Surface::queueBuffer making up timestamp: %.2f ms",

            timestamp / 1000000.f);

            timestamp / 1000000.0);

    } else {

        timestamp = mTimestamp;

    }