diff options
| -rw-r--r-- | libs/binder/IMemory.cpp | 18 | ||||
| -rw-r--r-- | libs/gui/BufferQueueConsumer.cpp | 17 |
2 files changed, 4 insertions, 31 deletions
diff --git a/libs/binder/IMemory.cpp b/libs/binder/IMemory.cpp index fb8d620..e9891a8 100644 --- a/libs/binder/IMemory.cpp +++ b/libs/binder/IMemory.cpp @@ -26,7 +26,6 @@ #include <sys/mman.h> #include <binder/IMemory.h> -#include <cutils/log.h> #include <utils/KeyedVector.h> #include <utils/threads.h> #include <utils/Atomic.h> @@ -188,26 +187,15 @@ sp<IMemoryHeap> BpMemory::getMemory(ssize_t* offset, size_t* size) const if (heap != 0) { mHeap = interface_cast<IMemoryHeap>(heap); if (mHeap != 0) { - size_t heapSize = mHeap->getSize(); - if (s <= heapSize - && o >= 0 - && (static_cast<size_t>(o) <= heapSize - s)) { - mOffset = o; - mSize = s; - } else { - // Hm. - android_errorWriteWithInfoLog(0x534e4554, - "26877992", -1, NULL, 0); - mOffset = 0; - mSize = 0; - } + mOffset = o; + mSize = s; } } } } if (offset) *offset = mOffset; if (size) *size = mSize; - return (mSize > 0) ? mHeap : 0; + return mHeap; } // --------------------------------------------------------------------------- diff --git a/libs/gui/BufferQueueConsumer.cpp b/libs/gui/BufferQueueConsumer.cpp index 7504ed4..bb3e1b0 100644 --- a/libs/gui/BufferQueueConsumer.cpp +++ b/libs/gui/BufferQueueConsumer.cpp @@ -26,10 +26,6 @@ #include <gui/IConsumerListener.h> #include <gui/IProducerListener.h> -#include <binder/IPCThreadState.h> -#include <binder/PermissionCache.h> -#include <private/android_filesystem_config.h> - namespace android { BufferQueueConsumer::BufferQueueConsumer(const sp<BufferQueueCore>& core) : @@ -576,18 +572,7 @@ sp<NativeHandle> BufferQueueConsumer::getSidebandStream() const { } void BufferQueueConsumer::dump(String8& result, const char* prefix) const { - const IPCThreadState* ipc = IPCThreadState::self(); - const pid_t pid = ipc->getCallingPid(); - const uid_t uid = ipc->getCallingUid(); - if ((uid != AID_SHELL) - && !PermissionCache::checkPermission(String16( - "android.permission.DUMP"), pid, uid)) { - result.appendFormat("Permission Denial: can't dump BufferQueueConsumer " - "from pid=%d, uid=%d\n", pid, uid); - android_errorWriteWithInfoLog(0x534e4554, "27046057", uid, NULL, 0); - } else { - mCore->dump(result, prefix); - } + mCore->dump(result, prefix); } } // namespace android |