Merge "Binder: recycle Parcel in finally block" am: 8581d27415 am: 0c1dac2572 am: b4f0710e19 am: 2cc9570c3b

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1926857

Change-Id: Ibeb6d54f6be510c6800c57c28a32398f084be89a

1 files changed, 4 insertions, 3 deletions

diff --git a/core/java/android/os/Binder.java b/core/java/android/os/Binder.java
index e2d7847b85e9..429450ce8e5e 100644
--- a/core/java/android/os/Binder.java
+++ b/core/java/android/os/Binder.java
@@ -1308,10 +1308,11 @@ public class Binder implements IBinder {
                         data.readCallingWorkSourceUid());
                 observer.callEnded(callSession, data.dataSize(), reply.dataSize(), workSourceUid);
             }
+
+            checkParcel(this, code, reply, "Unreasonably large binder reply buffer");
+            reply.recycle();
+            data.recycle();
         }
-        checkParcel(this, code, reply, "Unreasonably large binder reply buffer");
-        reply.recycle();
-        data.recycle();
 
         // Just in case -- we are done with the IPC, so there should be no more strict
         // mode violations that have gathered for this thread. Either they have been