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

am ffae4fcc: attempt to fix [2099362] Possible SurfaceFlinger crash

Browse Source 
Merge commit 'ffae4fcc78d0f280da6052d102b11962fb8041b7' into eclair-plus-aosp

* commit 'ffae4fcc78d0f280da6052d102b11962fb8041b7':
  attempt to fix [2099362] Possible SurfaceFlinger crash
This commit is contained in:
Mathias Agopian
2009-09-04 19:52:50 -07:00
committed by Android Git Automerger
parent 542051f19f ffae4fcc78
commit 28be8886af
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libs/surfaceflinger/SurfaceFlinger.cpp
View File

@@ -573,8 +573,10 @@ void SurfaceFlinger::handleTransaction(uint32_t transactionFlags)
// do this without lock held
const size_t count = ditchedLayers.size();
for (size_t i=0 ; i<count ; i++) {
//LOGD("ditching layer %p", ditchedLayers[i].get());
ditchedLayers[i]->ditch();
if (ditchedLayers[i] != 0) {
//LOGD("ditching layer %p", ditchedLayers[i].get());
ditchedLayers[i]->ditch();
}
}
}
@@ -1082,6 +1084,8 @@ status_t SurfaceFlinger::invalidateLayerVisibility(const sp<LayerBase>& layer)
status_t SurfaceFlinger::addLayer_l(const sp<LayerBase>& layer)
{
if (layer == 0)
return BAD_VALUE;
ssize_t i = mCurrentState.layersSortedByZ.add(
layer, &LayerBase::compareCurrentStateZ);
sp<LayerBaseClient> lbc = LayerBase::dynamicCast< LayerBaseClient* >(layer.get());