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

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

Change-Id: I822c72fb027da80e39762c03b228e7c966bbe253
This commit is contained in:
Steven Moreland
2021-12-16 17:46:12 +00:00
committed by Automerger Merge Worker

View File

@@ -1235,10 +1235,11 @@ public class Binder implements IBinder {
data.readCallingWorkSourceUid()); data.readCallingWorkSourceUid());
observer.callEnded(callSession, data.dataSize(), reply.dataSize(), workSourceUid); observer.callEnded(callSession, data.dataSize(), reply.dataSize(), workSourceUid);
} }
}
checkParcel(this, code, reply, "Unreasonably large binder reply buffer"); checkParcel(this, code, reply, "Unreasonably large binder reply buffer");
reply.recycle(); reply.recycle();
data.recycle(); data.recycle();
}
// Just in case -- we are done with the IPC, so there should be no more strict // 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 // mode violations that have gathered for this thread. Either they have been