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

Commit f83381fb authored by Dan Pasanen's avatar Dan Pasanen
Browse files

Merge tag 'android-7.1.2_r24' into cm-14.1 

Android 7.1.2 release 24

# gpg: Signature made Fri 30 Jun 2017 01:19:30 PM CDT
# gpg:                using DSA key E8AD3F819AB10E78
# gpg: Can't check signature: No public key
parents 1eed0779 ae26dee4

libs/gui/IGraphicBufferProducer.cpp

+9 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <binder/Parcel.h>

#include <binder/IInterface.h>



#include <gui/BufferQueueDefs.h>

#include <gui/IGraphicBufferProducer.h>

#include <gui/IProducerListener.h>
@@ -203,8 +204,16 @@ public: 
        if (result != NO_ERROR) {

            return result;

        }



        *slot = reply.readInt32();

        result = reply.readInt32();

        if (result == NO_ERROR &&

                (*slot < 0 || *slot >= BufferQueueDefs::NUM_BUFFER_SLOTS)) {

            ALOGE("attachBuffer returned invalid slot %d", *slot);

            android_errorWriteLog(0x534e4554, "37478824");

            return UNKNOWN_ERROR;

        }



        return result;

    }

libs/gui/Surface.cpp

+6 −0
Original line number Diff line number Diff line
@@ -306,6 +306,12 @@ int Surface::dequeueBuffer(android_native_buffer_t** buffer, int* fenceFd) { 
        return result;

    }



    if (buf < 0 || buf >= NUM_BUFFER_SLOTS) {

        ALOGE("dequeueBuffer: IGraphicBufferProducer returned invalid slot number %d", buf);

        android_errorWriteLog(0x534e4554, "36991414"); // SafetyNet logging

        return FAILED_TRANSACTION;

    }



    Mutex::Autolock lock(mMutex);



    sp<GraphicBuffer>& gbuf(mSlots[buf].buffer);

libs/ui/Fence.cpp

+1 −1
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ status_t Fence::unflatten(void const*& buffer, size_t& size, int const*& fds, si 
        return INVALID_OPERATION;

    }



    if (size < 1) {

    if (size < getFlattenedSize()) {

        return NO_MEMORY;

    }