Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am b9420005: am b06aac86: Merge change 24948 into eclair

Browse Source 
Merge commit 'b942000592bbf5fb309fe906f079a6f8b3f03b97'

* commit 'b942000592bbf5fb309fe906f079a6f8b3f03b97':
  fix [2117464] SF can crash when calling dumpsys
This commit is contained in:
Mathias Agopian
2009-09-16 23:55:59 -07:00
committed by Android Git Automerger
parent 543c788998 b942000592
commit 750f278d80
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libs/surfaceflinger/SurfaceFlinger.cpp
View File

@@ -1524,13 +1524,24 @@ status_t SurfaceFlinger::dump(int fd, const Vector<String16>& args)
result.append( l->lcblk->dump(" ") );
sp<const Buffer> buf0(l->getBuffer(0));
sp<const Buffer> buf1(l->getBuffer(1));
uint32_t w0=0, h0=0, s0=0;
uint32_t w1=0, h1=0, s1=0;
if (buf0 != 0) {
w0 = buf0->getWidth();
h0 = buf0->getHeight();
s0 = buf0->getStride();
}
if (buf1 != 0) {
w1 = buf1->getWidth();
h1 = buf1->getHeight();
s1 = buf1->getStride();
}
snprintf(buffer, SIZE,
" "
"format=%2d, [%3ux%3u:%3u] [%3ux%3u:%3u],"
" freezeLock=%p\n",
l->pixelFormat(),
buf0->getWidth(), buf0->getHeight(), buf0->getStride(),
buf1->getWidth(), buf1->getHeight(), buf1->getStride(),
w0, h0, s0, w1, h1, s1,
l->getFreezeLock().get());
result.append(buffer);
buffer[0] = 0;