commit 4cfcfe488e2d43baf07343d52d2c20a950e4d2bb
author Christopher Wiley <wiley@google.com> Tue Jul 19 18:21:27 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jul 19 18:21:27 2016 +0000
tree 1b0bac7d656e90c14e341f306eb6ce2b5a22ce1f
parent 27cd7b256eb08bf9dec7e4e8af8375711ab10225
parent 869f04bedb18059ff706e5df0f1c955d163cd6f3

Merge \\"Fix broken readNullableStrongBinder<T> implementation\\" am: 6e81c9a4c6
am: 869f04bedb

Change-Id: If89b553521a2ebe384dbd63756364c263c75cfd3

include/binder/Parcel.h

diff --git a/include/binder/Parcel.h b/include/binder/Parcel.h
index 42ed148..c9d9bf8 100644
--- a/include/binder/Parcel.h
+++ b/include/binder/Parcel.h
@@ -586,10 +586,12 @@
     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>