summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-05-29 14:57:33 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-05-29 14:57:33 -0700
commit9176469702fac61846d6b2eab03bc2ea6c94241a (patch)
treea9bc03f856fba7eaff2173a5e18ffd67e8403bd5
parent8a718a45968a6e6fe87eff13dd43c05887850582 (diff)
parentb61ae351256518add7bcb40e0bf18337dd87195c (diff)
downloadframeworks_base-9176469702fac61846d6b2eab03bc2ea6c94241a.zip
frameworks_base-9176469702fac61846d6b2eab03bc2ea6c94241a.tar.gz
frameworks_base-9176469702fac61846d6b2eab03bc2ea6c94241a.tar.bz2
am b61ae351: Merge change 2747 into donut
Merge commit 'b61ae351256518add7bcb40e0bf18337dd87195c' * commit 'b61ae351256518add7bcb40e0bf18337dd87195c': 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 e3d0f77..eb3c3e5 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;