summaryrefslogtreecommitdiffstats
path: root/include/binder
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2011-11-05 02:35:57 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2011-11-05 02:35:57 +0000
commitefd912c05c0ef550a1c5ba7a14281261f6a0f9f4 (patch)
tree36828ed995591754042ed8b5bff3b178b1afd25b /include/binder
parent60e2245b63c54c8776ef97ce4bccb4d1510f85f1 (diff)
parent93ff1f985e233fe04412a65041e977c9f0c21f5b (diff)
downloadframeworks_native-efd912c05c0ef550a1c5ba7a14281261f6a0f9f4.zip
frameworks_native-efd912c05c0ef550a1c5ba7a14281261f6a0f9f4.tar.gz
frameworks_native-efd912c05c0ef550a1c5ba7a14281261f6a0f9f4.tar.bz2
am 5462bc63: Fix a leak in Parcel::writeBlob.
* commit '5462bc6318b4b70e7a58c66994e2bd79f59d9739': 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.