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

Unverified Commit 8d310650 authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-7.1.1_r9' of... 

Merge tag 'android-7.1.1_r9' of https://android.googlesource.com/platform/frameworks/native into cm-14.1

Android 7.1.1 release 9
parents b7747813 675e212c

include/binder/Parcel.h

+8 −0
Original line number Original line Diff line number Diff line
@@ -591,8 +591,16 @@ status_t Parcel::unsafeReadTypedVector( 
        return UNEXPECTED_NULL;

        return UNEXPECTED_NULL;

    }

    }





    if (val->max_size() < size) {

        return NO_MEMORY;

    }



    val->resize(size);

    val->resize(size);





    if (val->size() < size) {

        return NO_MEMORY;

    }



    for (auto& v: *val) {

    for (auto& v: *val) {

        status = (this->*read_func)(&v);

        status = (this->*read_func)(&v);

libs/gui/BufferQueueConsumer.cpp

+1 −0
Original line number Original line Diff line number Diff line
@@ -715,6 +715,7 @@ status_t BufferQueueConsumer::setTransformHint(uint32_t hint) { 
}

}





sp<NativeHandle> BufferQueueConsumer::getSidebandStream() const {

sp<NativeHandle> BufferQueueConsumer::getSidebandStream() const {

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

    return mCore->mSidebandStream;

    return mCore->mSidebandStream;

}

}