commit 5c865e5d25501f4edd2af960efbd28c3822b22db
author Michael Wachenschwanz <mwachens@google.com> Fri May 19 18:56:34 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri May 19 18:56:34 2017 +0000
tree a85bb3071a1156a735de48621b9d1f3e91402629
parent 2ad2b55dbb42443c5c00484478afa55e97ec4770
parent f5c237480480f71d9eee91ffc566dfc8b0604c76

Merge "DO NOT MERGE Revert "Logging for catching memory issue in Parcel"" into oc-dev am: 1967749cdc
am: f5c2374804

Change-Id: I2785c388d27537ba4c5671b0398ff33628be901d

libs/binder/Parcel.cpp

diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp
index 6fefb38..aec8f10 100644
--- a/libs/binder/Parcel.cpp
+++ b/libs/binder/Parcel.cpp
@@ -2547,16 +2547,8 @@
             objectsSize = 0;
         } else {
             while (objectsSize > 0) {
-                if (mObjects[objectsSize-1] < desired) {
-                    // Check for an object being sliced
-                    if (desired < mObjects[objectsSize-1] + sizeof(flat_binder_object)) {
-                        ALOGE("Attempt to shrink Parcel would slice an objects allocated memory");
-                        return UNKNOWN_ERROR + 0xBADF10;
-                    }
+                if (mObjects[objectsSize-1] < desired)
                     break;
-                }
-                // STOPSHIP: Above code to be replaced with following commented code:
-                // if (mObjects[objectsSize-1] + sizeof(flat_binder_object) <= desired) break;
                 objectsSize--;
             }
         }