diff options
| author | Narayan Kamath <narayan@google.com> | 2014-06-13 10:22:29 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-13 10:22:29 +0000 |
| commit | c6decb12c17c36fe0a3b36107f6666552fcd3631 (patch) | |
| tree | 5d8739fc23fa05bc3a67a78ba8863203b428700b | |
| parent | f40c1fe5ae6afb9ce1fb179c3b0686d22ca98469 (diff) | |
| parent | ece6238488207bd20cc4d32fda90514ebf461206 (diff) | |
| download | frameworks_native-c6decb12c17c36fe0a3b36107f6666552fcd3631.zip frameworks_native-c6decb12c17c36fe0a3b36107f6666552fcd3631.tar.gz frameworks_native-c6decb12c17c36fe0a3b36107f6666552fcd3631.tar.bz2 | |
am ece62384: Merge "Remove Parcel::writeIntPtr."
* commit 'ece6238488207bd20cc4d32fda90514ebf461206':
Remove Parcel::writeIntPtr.
| -rw-r--r-- | include/binder/Parcel.h | 1 | ||||
| -rw-r--r-- | libs/binder/Parcel.cpp | 5 |
2 files changed, 0 insertions, 6 deletions
diff --git a/include/binder/Parcel.h b/include/binder/Parcel.h index ce630bd..96aeee8 100644 --- a/include/binder/Parcel.h +++ b/include/binder/Parcel.h @@ -97,7 +97,6 @@ public: status_t writeInt64(int64_t val); status_t writeFloat(float val); status_t writeDouble(double val); - status_t writeIntPtr(intptr_t val); status_t writeCString(const char* str); status_t writeString8(const String8& str); status_t writeString16(const String16& str); diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp index 729cf21..f943f82 100644 --- a/libs/binder/Parcel.cpp +++ b/libs/binder/Parcel.cpp @@ -679,11 +679,6 @@ status_t Parcel::writeDouble(double val) #endif -status_t Parcel::writeIntPtr(intptr_t val) -{ - return writeAligned(val); -} - status_t Parcel::writeCString(const char* str) { return write(str, strlen(str)+1); |