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

fix [2129080] Soft reboot after clicking around and then rubbing the screen

Browse Source
This commit is contained in:
Mathias Agopian
2009-09-17 19:19:08 -07:00
parent cd25c56ad4
commit ac7f13bc1a
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libs/surfaceflinger/Layer.cpp
View File

@@ -176,7 +176,7 @@ void Layer::reloadTexture(const Region& dirty)
// this failed, for instance, because we don't support // this failed, for instance, because we don't support
// NPOT. // NPOT.
// FIXME: do something! // FIXME: do something!
LOGD("layer=%p, glEGLImageTargetTexture2DOES(%d) " LOGD("layer=%p, glEGLImageTargetTexture2DOES(%p) "
"failed err=0x%04x", "failed err=0x%04x",
this, mTextures[index].image, error); this, mTextures[index].image, error);
mFlags &= ~DisplayHardware::DIRECT_TEXTURE; mFlags &= ~DisplayHardware::DIRECT_TEXTURE;
@@ -256,11 +256,17 @@ sp<SurfaceBuffer> Layer::requestBuffer(int index, int usage)
w = mWidth; w = mWidth;
h = mHeight; h = mHeight;
buffer = mBuffers[index]; buffer = mBuffers[index];
// destroy() could have been called before we get here, we log it
// because it's uncommon, and the code below should handle it
LOGW_IF(buffer==0,
"mBuffers[%d] is null (mWidth=%d, mHeight=%d)",
index, w, h);
mBuffers[index].clear(); mBuffers[index].clear();
} }
if (buffer!=0 && buffer->getStrongCount() == 1) {
if (buffer->getStrongCount() == 1) {
err = buffer->reallocate(w, h, mFormat, usage, mBufferFlags); err = buffer->reallocate(w, h, mFormat, usage, mBufferFlags);
} else { } else {
// here we have to reallocate a new buffer because we could have a // here we have to reallocate a new buffer because we could have a