summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2014-03-20 11:06:54 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-20 11:06:54 -0700
commitd070009ecdb9e8c58ce5d1540d5bcba5587a0448 (patch)
treef5b30e36b3d0a73bc06a4874af151a1373ed790c
parent50d36d58369cdf48bc6fcdba96b36c846be8587a (diff)
parentdf6774c9a3c1460554208925f38dde08953b6d0b (diff)
downloadandroid_frameworks_native-d070009ecdb9e8c58ce5d1540d5bcba5587a0448.tar.gz
android_frameworks_native-d070009ecdb9e8c58ce5d1540d5bcba5587a0448.tar.bz2
android_frameworks_native-d070009ecdb9e8c58ce5d1540d5bcba5587a0448.zip
am df6774c9: am 7c1cdbdd: am e23f8b8f: am 1f70863d: am 37b44969: Add support for writing byte arrays to parcels
* commit 'df6774c9a3c1460554208925f38dde08953b6d0b': Add support for writing byte arrays to parcels
-rw-r--r--include/binder/Parcel.h1
-rw-r--r--libs/binder/Parcel.cpp11
2 files changed, 12 insertions, 0 deletions
diff --git a/include/binder/Parcel.h b/include/binder/Parcel.h
index 3ff95d282..40ba529f6 100644
--- a/include/binder/Parcel.h
+++ b/include/binder/Parcel.h
@@ -103,6 +103,7 @@ public:
status_t writeStrongBinder(const sp<IBinder>& val);
status_t writeWeakBinder(const wp<IBinder>& val);
status_t write(const Flattenable& val);
+ status_t writeByteArray(size_t len, const uint8_t *val);
template<typename T>
status_t write(const LightFlattenable<T>& val);
diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp
index 4c15913a7..cb90b8368 100644
--- a/libs/binder/Parcel.cpp
+++ b/libs/binder/Parcel.cpp
@@ -617,6 +617,17 @@ status_t Parcel::writeInt32(int32_t val)
return writeAligned(val);
}
+status_t Parcel::writeByteArray(size_t len, const uint8_t *val) {
+ if (!val) {
+ return writeAligned(-1);
+ }
+ status_t ret = writeAligned(len);
+ if (ret == NO_ERROR) {
+ ret = write(val, len * sizeof(*val));
+ }
+ return ret;
+}
+
status_t Parcel::writeInt64(int64_t val)
{
return writeAligned(val);