summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-05-29 14:55:48 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2009-05-29 14:55:48 -0700
commitb61ae351256518add7bcb40e0bf18337dd87195c (patch)
treeee9c2c1ac1a47188f8266938f5af00d6bae80a75
parenta5f50b8f49cc9b34b1de462e11498d92c692b978 (diff)
parent6d892b60dde12aff270df1b3d2809336c3fc1265 (diff)
downloadframeworks_base-b61ae351256518add7bcb40e0bf18337dd87195c.zip
frameworks_base-b61ae351256518add7bcb40e0bf18337dd87195c.tar.gz
frameworks_base-b61ae351256518add7bcb40e0bf18337dd87195c.tar.bz2
Merge change 2747 into donut
* changes: log the geomerty of surfaces causing an out of memory in SurfaceFlinger.
-rw-r--r--libs/surfaceflinger/LayerBitmap.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/libs/surfaceflinger/LayerBitmap.cpp b/libs/surfaceflinger/LayerBitmap.cpp
index e844350..397ddc8 100644
--- a/libs/surfaceflinger/LayerBitmap.cpp
+++ b/libs/surfaceflinger/LayerBitmap.cpp
@@ -114,7 +114,9 @@ status_t LayerBitmap::setBits(uint32_t w, uint32_t h, uint32_t alignment,
}
if (mBitsMemory==0 || mSurface.data==0) {
- LOGE("not enough memory for layer bitmap size=%u", size);
+ LOGE("not enough memory for layer bitmap "
+ "size=%u (w=%d, h=%d, stride=%d, format=%d)",
+ size, int(w), int(h), int(stride), int(format));
allocator->dump("LayerBitmap");
mSurface.data = 0;
mSize = -1U;