resolve merge conflicts of 5fef0c6 to nyc-mr1-dev-plus-aosp (9b415621) · Commits · e / os / android_frameworks_native

include/binder/Parcel.h

+8 −0

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

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

		val->resize(static_cast<size_t>(size));

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

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