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

Commit 5c6ac025 authored by Dan Pasanen's avatar Dan Pasanen
Browse files

Merge tag 'android-7.1.1_r21' into cm-14.1 

Android 7.1.1 release 21

# gpg: Signature made Wed 01 Feb 2017 04:40:16 PM CST
# gpg:                using DSA key E8AD3F819AB10E78
# gpg: Can't check signature: No public key
parents 31821ff8 bfd36c3d

libs/binder/Parcel.cpp

+2 −2
Original line number Diff line number Diff line
@@ -548,7 +548,7 @@ status_t Parcel::appendFrom(const Parcel *parcel, size_t offset, size_t len) 
        // grow objects

        if (mObjectsCapacity < mObjectsSize + numObjects) {

            size_t newSize = ((mObjectsSize + numObjects)*3)/2;

            if (newSize < mObjectsSize) return NO_MEMORY;   // overflow

            if (newSize*sizeof(binder_size_t) < mObjectsSize) return NO_MEMORY;   // overflow

            binder_size_t *objects =

                (binder_size_t*)realloc(mObjects, newSize*sizeof(binder_size_t));

            if (objects == (binder_size_t*)0) {
@@ -1350,7 +1350,7 @@ restart_write: 
    }

    if (!enoughObjects) {

        size_t newSize = ((mObjectsSize+2)*3)/2;

        if (newSize < mObjectsSize) return NO_MEMORY;   // overflow

        if (newSize*sizeof(binder_size_t) < mObjectsSize) return NO_MEMORY;   // overflow

        binder_size_t* objects = (binder_size_t*)realloc(mObjects, newSize*sizeof(binder_size_t));

        if (objects == NULL) return NO_MEMORY;

        mObjects = objects;

libs/gui/BufferQueueCore.cpp

+1 −0
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ BufferQueueCore::BufferQueueCore(const sp<IGraphicBufferAlloc>& allocator) : 
    mSharedBufferSlot(INVALID_BUFFER_SLOT),

    mSharedBufferCache(Rect::INVALID_RECT, 0, NATIVE_WINDOW_SCALING_MODE_FREEZE,

            HAL_DATASPACE_UNKNOWN),

    mLastQueuedSlot(INVALID_BUFFER_SLOT),

    mUniqueId(getUniqueId())

{

    if (allocator == NULL) {

libs/gui/BufferQueueProducer.cpp

+1 −0
Original line number Diff line number Diff line
@@ -1352,6 +1352,7 @@ status_t BufferQueueProducer::setGenerationNumber(uint32_t generationNumber) { 


String8 BufferQueueProducer::getConsumerName() const {

    ATRACE_CALL();

    Mutex::Autolock lock(mCore->mMutex);

    BQ_LOGV("getConsumerName: %s", mConsumerName.string());

    return mConsumerName;

}