From 30abcbd93d0d2700f6831f9400a853bdc33d60a4 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 28 Oct 2011 20:40:07 -0700 Subject: [PATCH 1/2] Revert "Merge "Improve the slow query instrumentation." into ics-mr0" This reverts commit 2d280f754e32e556407df05d977cfabdfff1c070, reversing changes made to 2cc1c5d067736f221554be593c2ba2c96390f847. --- libs/binder/CursorWindow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/binder/CursorWindow.cpp b/libs/binder/CursorWindow.cpp index 60681c420..1b85a71ca 100644 --- a/libs/binder/CursorWindow.cpp +++ b/libs/binder/CursorWindow.cpp @@ -211,7 +211,7 @@ uint32_t CursorWindow::alloc(size_t size, bool aligned) { uint32_t offset = mHeader->freeOffset + padding; uint32_t nextFreeOffset = offset + size; if (nextFreeOffset > mSize) { - LOGW("Window is full: requested allocation %d bytes, " + LOGE("Window is full: requested allocation %d bytes, " "free space %d bytes, window size %d bytes", size, freeSpace(), mSize); return 0; From 1b47eac28cb18ec3ecdc8907d674ce576f63f1d0 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 30 Oct 2011 13:56:11 -0700 Subject: [PATCH 2/2] Revert "Improve the slow query instrumentation." This reverts commit 89101cd9d9b5c1a6ff1ed85eba0613ca4c4802e2. --- libs/binder/CursorWindow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/binder/CursorWindow.cpp b/libs/binder/CursorWindow.cpp index 60681c420..1b85a71ca 100644 --- a/libs/binder/CursorWindow.cpp +++ b/libs/binder/CursorWindow.cpp @@ -211,7 +211,7 @@ uint32_t CursorWindow::alloc(size_t size, bool aligned) { uint32_t offset = mHeader->freeOffset + padding; uint32_t nextFreeOffset = offset + size; if (nextFreeOffset > mSize) { - LOGW("Window is full: requested allocation %d bytes, " + LOGE("Window is full: requested allocation %d bytes, " "free space %d bytes, window size %d bytes", size, freeSpace(), mSize); return 0;