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

Commit a59d7a6a authored by Andreas Gampe's avatar Andreas Gampe Committed by Gerrit Code Review
Browse files

Merge "GUI: Remove unused variables"

parents e22262ff 7398a5af

libs/gui/CpuConsumer.cpp

+0 −1
Original line number Diff line number Diff line
@@ -194,7 +194,6 @@ status_t CpuConsumer::lockNextBuffer(LockedBuffer *nativeBuffer) { 
status_t CpuConsumer::unlockBuffer(const LockedBuffer &nativeBuffer) {

    Mutex::Autolock _l(mMutex);

    size_t lockedIdx = 0;

    status_t err;



    void *bufPtr = reinterpret_cast<void *>(nativeBuffer.data);

    for (; lockedIdx < static_cast<size_t>(mMaxLockedBuffers); lockedIdx++) {

libs/gui/ISurfaceComposer.cpp

+0 −2
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ public: 


    virtual sp<ISurfaceComposerClient> createConnection()

    {

        uint32_t n;

        Parcel data, reply;

        data.writeInterfaceToken(ISurfaceComposer::getInterfaceDescriptor());

        remote()->transact(BnSurfaceComposer::CREATE_CONNECTION, data, &reply);
@@ -64,7 +63,6 @@ public: 


    virtual sp<IGraphicBufferAlloc> createGraphicBufferAlloc()

    {

        uint32_t n;

        Parcel data, reply;

        data.writeInterfaceToken(ISurfaceComposer::getInterfaceDescriptor());

        remote()->transact(BnSurfaceComposer::CREATE_GRAPHIC_BUFFER_ALLOC, data, &reply);

libs/gui/Surface.cpp

+2 −3
Original line number Diff line number Diff line
@@ -96,8 +96,8 @@ void Surface::setSidebandStream(const sp<NativeHandle>& stream) { 
void Surface::allocateBuffers() {

    uint32_t reqWidth = mReqWidth ? mReqWidth : mUserWidth;

    uint32_t reqHeight = mReqHeight ? mReqHeight : mUserHeight;

    mGraphicBufferProducer->allocateBuffers(mSwapIntervalZero, mReqWidth,

            mReqHeight, mReqFormat, mReqUsage);

    mGraphicBufferProducer->allocateBuffers(mSwapIntervalZero, reqWidth,

            reqHeight, mReqFormat, mReqUsage);

}



int Surface::hook_setSwapInterval(ANativeWindow* window, int interval) {
@@ -274,7 +274,6 @@ int Surface::cancelBuffer(android_native_buffer_t* buffer, 


int Surface::getSlotFromBufferLocked(

        android_native_buffer_t* buffer) const {

    bool dumpedState = false;

    for (int i = 0; i < NUM_BUFFER_SLOTS; i++) {

        if (mSlots[i].buffer != NULL &&

                mSlots[i].buffer->handle == buffer->handle) {