diff options
| author | Elliott Hughes <enh@google.com> | 2013-03-13 19:28:17 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-03-13 19:28:17 -0700 |
| commit | 9b57ad737bceba9f8d4f5be303c70fa72be00eaf (patch) | |
| tree | 0c7abf312040b931533ddf72874bbb2c8f9966bc /libs/binder/IMemory.cpp | |
| parent | 1d6e52d17e2df913e10925c5e3e652d3421ff320 (diff) | |
| parent | 8facd1b2ea02796b575f123b420590d2b8354910 (diff) | |
| download | frameworks_native-9b57ad737bceba9f8d4f5be303c70fa72be00eaf.zip frameworks_native-9b57ad737bceba9f8d4f5be303c70fa72be00eaf.tar.gz frameworks_native-9b57ad737bceba9f8d4f5be303c70fa72be00eaf.tar.bz2 | |
am 8facd1b2: Merge "Add a compatibility symbol for the MemoryBase constructor."
* commit '8facd1b2ea02796b575f123b420590d2b8354910':
Add a compatibility symbol for the MemoryBase constructor.
Diffstat (limited to 'libs/binder/IMemory.cpp')
| -rw-r--r-- | libs/binder/IMemory.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/binder/IMemory.cpp b/libs/binder/IMemory.cpp index cd2451a..947ac19 100644 --- a/libs/binder/IMemory.cpp +++ b/libs/binder/IMemory.cpp @@ -298,11 +298,11 @@ void BpMemoryHeap::assertReallyMapped() const uint32_t flags = reply.readInt32(); uint32_t offset = reply.readInt32(); - ALOGE_IF(err, "binder=%p transaction failed fd=%d, size=%ld, err=%d (%s)", + ALOGE_IF(err, "binder=%p transaction failed fd=%d, size=%d, err=%d (%s)", asBinder().get(), parcel_fd, size, err, strerror(-err)); int fd = dup( parcel_fd ); - ALOGE_IF(fd==-1, "cannot dup fd=%d, size=%ld, err=%d (%s)", + ALOGE_IF(fd==-1, "cannot dup fd=%d, size=%d, err=%d (%s)", parcel_fd, size, err, strerror(errno)); int access = PROT_READ; @@ -315,7 +315,7 @@ void BpMemoryHeap::assertReallyMapped() const mRealHeap = true; mBase = mmap(0, size, access, MAP_SHARED, fd, offset); if (mBase == MAP_FAILED) { - ALOGE("cannot map BpMemoryHeap (binder=%p), size=%ld, fd=%d (%s)", + ALOGE("cannot map BpMemoryHeap (binder=%p), size=%d, fd=%d (%s)", asBinder().get(), size, fd, strerror(errno)); close(fd); } else { |