| commit | 0c246c18b80a3e7ef3a2cdee287a6af6994cbc40 | [log] [tgz] |
|---|---|---|
| author | Ganesh Mahendran <opensource.ganesh@gmail.com> | Wed Nov 01 16:07:56 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Nov 01 16:07:56 2017 +0000 |
| tree | eabda5127328200318c131c25bd3cfe9a90c11f5 | |
| parent | aa09b645206825907a6032d3ae4ba9cd5567e6d4 [diff] | |
| parent | f329278f1616ef4b0e27d0e588ef18b5d49baa36 [diff] |
Merge "libbinder: remove unnecessary check" am: 4f3f652925 am: 740030578b am: f329278f16 Change-Id: I1069df17ed1bf3994244f82aa475896f7433237d
diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp index 84ca3c0..f739f07 100644 --- a/libs/binder/Parcel.cpp +++ b/libs/binder/Parcel.cpp
@@ -2645,7 +2645,7 @@ pthread_mutex_unlock(&gParcelGlobalAllocSizeLock); mData = data; mDataCapacity = desired; - } else if (desired > mDataCapacity) { + } else { mError = NO_MEMORY; return NO_MEMORY; }