| commit | 6e81c9a4c6040f9448329b87a8cbc808d9fb5124 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Jul 19 18:06:37 2016 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Jul 19 18:06:37 2016 +0000 |
| tree | 05a3e1fab99a737161f06e6415a12124e11167d6 | |
| parent | 7d8f246415075326557b0ebbf95050b715fd4002 [diff] | |
| parent | 447b00fd55c90a7b2ad3cef74fb3754fec243fa6 [diff] |
Merge "Fix broken readNullableStrongBinder<T> implementation"
diff --git a/include/binder/Parcel.h b/include/binder/Parcel.h index 97a3376..cdf3584 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>