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

Commit cc92c1b5 authored Jan 04, 2017 by Dan Pasanen

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

Android 7.1.1 release 9

Change-Id: I9fad5ad5ee224b2c0f50d353bca1686ba4d3f555

parents e98640f9 675e212c

include/binder/Parcel.h

+8 −0

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

		if (val->max_size() < size) {
		return NO_MEMORY;
		}

		val->resize(size);

		if (val->size() < size) {
		return NO_MEMORY;
		}

		for (auto& v: *val) {
		status = (this->*read_func)(&v);

libs/gui/BufferQueueConsumer.cpp

+1 −0

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

		sp<NativeHandle> BufferQueueConsumer::getSidebandStream() const {
		Mutex::Autolock lock(mCore->mMutex);
		return mCore->mSidebandStream;
		}