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

am 7a1c20ad: Merge change 22344 into eclair

Browse Source 
Merge commit '7a1c20ad4bfdc9b54b1b0b90115afed774bb9811' into eclair-plus-aosp

* commit '7a1c20ad4bfdc9b54b1b0b90115afed774bb9811':
  fix [2070341] [FAST BLOCKER] can't successfully setup erc52
This commit is contained in:
Mathias Agopian
2009-08-21 15:47:33 -07:00
committed by Android Git Automerger
parent 0949f652ee 7a1c20ad4b
commit 6b3776cd3e
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libs/ui/Surface.cpp
View File

@@ -602,7 +602,18 @@ int Surface::dequeueBuffer(android_native_buffer_t** buffer)
mBackbufferIndex = backIdx;
layer_cblk_t* const lcblk = &(cblk->layers[index]);
volatile const surface_info_t* const back = lcblk->surface + backIdx;
if ((back->flags & surface_info_t::eNeedNewBuffer) || mUsageChanged) {
const sp<SurfaceBuffer>& backBuffer(mBuffers[backIdx]);
if (backBuffer==0 &&
!((back->flags & surface_info_t::eNeedNewBuffer) || mUsageChanged)) {
LOGW("dequeueBuffer: backbuffer is null, but eNeedNewBuffer "
"is not set, fetching a buffer anyways...");
}
if ((back->flags & surface_info_t::eNeedNewBuffer) ||mUsageChanged ||
backBuffer==0)
{
mUsageChanged = false;
err = getBufferLocked(backIdx, mUsage);
if (err == NO_ERROR) {
@@ -614,7 +625,6 @@ int Surface::dequeueBuffer(android_native_buffer_t** buffer)
}
if (err == NO_ERROR) {
const sp<SurfaceBuffer>& backBuffer(mBuffers[backIdx]);
if (backBuffer != 0) {
mDirtyRegion.set(backBuffer->width, backBuffer->height);
*buffer = backBuffer.get();