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

Merge change 22344 into eclair

Browse Source 
* changes:
  fix [2070341] [FAST BLOCKER] can't successfully setup erc52
This commit is contained in:
Android (Google) Code Review
2009-08-21 15:45:22 -07:00
parent d3d7945309 9e2be20cc5
commit 7a1c20ad4b
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; mBackbufferIndex = backIdx;
layer_cblk_t* const lcblk = &(cblk->layers[index]); layer_cblk_t* const lcblk = &(cblk->layers[index]);
volatile const surface_info_t* const back = lcblk->surface + backIdx; 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; mUsageChanged = false;
err = getBufferLocked(backIdx, mUsage); err = getBufferLocked(backIdx, mUsage);
if (err == NO_ERROR) { if (err == NO_ERROR) {
@@ -614,7 +625,6 @@ int Surface::dequeueBuffer(android_native_buffer_t** buffer)
} }
if (err == NO_ERROR) { if (err == NO_ERROR) {
const sp<SurfaceBuffer>& backBuffer(mBuffers[backIdx]);
if (backBuffer != 0) { if (backBuffer != 0) {
mDirtyRegion.set(backBuffer->width, backBuffer->height); mDirtyRegion.set(backBuffer->width, backBuffer->height);
*buffer = backBuffer.get(); *buffer = backBuffer.get();