summaryrefslogtreecommitdiffstats
path: root/include/binder
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2011-11-07 15:51:31 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2011-11-07 15:51:31 +0000
commitc17f56fdf11d5c5207d02d457692a40252aa3f34 (patch)
tree689f206d19097915136cf75aa06d4caf0af5c551 /include/binder
parent2d3f094611619b40fd54a9c24d006a30c447a359 (diff)
parentefd912c05c0ef550a1c5ba7a14281261f6a0f9f4 (diff)
downloadframeworks_native-c17f56fdf11d5c5207d02d457692a40252aa3f34.zip
frameworks_native-c17f56fdf11d5c5207d02d457692a40252aa3f34.tar.gz
frameworks_native-c17f56fdf11d5c5207d02d457692a40252aa3f34.tar.bz2
am 88061d6b: am 5462bc63: Fix a leak in Parcel::writeBlob.
* commit '88061d6b38cfb4bf374039846b753a3b21ac61e1': Fix a leak in Parcel::writeBlob.
Diffstat (limited to 'include/binder')
-rw-r--r--include/binder/Parcel.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/binder/Parcel.h b/include/binder/Parcel.h
index 3fa2acb..33b2f00 100644
--- a/include/binder/Parcel.h
+++ b/include/binder/Parcel.h
@@ -110,7 +110,8 @@ public:
// Place a file descriptor into the parcel. The given fd must remain
// valid for the lifetime of the parcel.
- status_t writeFileDescriptor(int fd);
+ // The Parcel does not take ownership of the given fd unless you ask it to.
+ status_t writeFileDescriptor(int fd, bool takeOwnership = false);
// Place a file descriptor into the parcel. A dup of the fd is made, which
// will be closed once the parcel is destroyed.