Commit 46258335 authored Jul 19, 2016 by Christopher Wiley Committed by android-build-merger Jul 19, 2016

Merge \\\\"Fix broken readNullableStrongBinder<T> implementation\\\\" am:...

Merge \\\\"Fix broken readNullableStrongBinder<T> implementation\\\\" am: 6e81c9a4 am: 869f04be am: 4cfcfe48
am: 7dee4ed3

Change-Id: I589542ab03aa009c8c5d92fe75e41cdace36676f

parents 282aaee1 7dee4ed3

include/binder/Parcel.h

+4 −2

Original line number	Diff line number	Diff line
		@@ -586,10 +586,12 @@ status_t Parcel::readNullableStrongBinder(sp<T>* val) const {
		if (ret == OK) {
		*val = interface_cast<T>(tmp);

		if (val->get() == nullptr) {
		return UNKNOWN_ERROR;
		if (val->get() == nullptr && tmp.get() != nullptr) {
		ret = UNKNOWN_ERROR;
		}
		}

		return ret;
		}

		template<typename T, typename U>