| commit | f329278f1616ef4b0e27d0e588ef18b5d49baa36 | [log] [tgz] |
|---|---|---|
| author | Ganesh Mahendran <opensource.ganesh@gmail.com> | Wed Nov 01 16:05:49 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Nov 01 16:05:49 2017 +0000 |
| tree | 291c19f22b40ab65051da396a2d3d2a9995e232c | |
| parent | 33d48abe37ca532779561a6f7aeef2120e00d663 [diff] | |
| parent | 740030578beab75d8a1e2526727df3e5f2302c56 [diff] |
Merge "libbinder: remove unnecessary check" am: 4f3f652925 am: 740030578b Change-Id: I40e1445f3ebd3b55ba226a1d91f00879ed8f5e67
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; }