ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

we were mistakenly optimizing out SF's main transactions in some cases

Browse Source 
due to a typo, SF's main transaction was conditional to having a
display transaction.

more correct fix for 6970310

Bug: 6970310
Change-Id: Iafd8c4e02afa5db829cc1c65950cfcc74754c6af
This commit is contained in:
Mathias Agopian 2012-08-15 13:46:03 -07:00
parent ac1f70bb71
commit 3559b07a88
1 changed files with 30 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
services/surfaceflinger/SurfaceFlinger.cpp
View File

@ -891,8 +891,7 @@ void SurfaceFlinger::handleTransactionLocked(uint32_t transactionFlags)
* (perform the transaction for each of them if needed) * (perform the transaction for each of them if needed)
*/ */
const bool layersNeedTransaction = transactionFlags & eTraversalNeeded; if (transactionFlags & eTraversalNeeded) {
if (layersNeedTransaction) {
for (size_t i=0 ; i<count ; i++) { for (size_t i=0 ; i<count ; i++) {
const sp<LayerBase>& layer = currentLayers[i]; const sp<LayerBase>& layer = currentLayers[i];
uint32_t trFlags = layer->getTransactionFlags(eTransactionNeeded); uint32_t trFlags = layer->getTransactionFlags(eTransactionNeeded);
@ -905,7 +904,7 @@ void SurfaceFlinger::handleTransactionLocked(uint32_t transactionFlags)
} }
/* /*
* Perform our own transaction if needed * Perform display own transactions if needed
*/ */
if (transactionFlags & eDisplayTransactionNeeded) { if (transactionFlags & eDisplayTransactionNeeded) {
@ -978,6 +977,11 @@ void SurfaceFlinger::handleTransactionLocked(uint32_t transactionFlags)
} }
} }
} }
}
/*
* Perform our own transaction if needed
*/
if (currentLayers.size() > mDrawingState.layersSortedByZ.size()) { if (currentLayers.size() > mDrawingState.layersSortedByZ.size()) {
// layers have been added // layers have been added
@ -1005,7 +1009,6 @@ void SurfaceFlinger::handleTransactionLocked(uint32_t transactionFlags)
} }
} }
} }
}
commitTransaction(); commitTransaction();
} }
@ -1406,7 +1409,7 @@ status_t SurfaceFlinger::removeLayer(const sp<LayerBase>& layer)
Mutex::Autolock _l(mStateLock); Mutex::Autolock _l(mStateLock);
status_t err = purgatorizeLayer_l(layer); status_t err = purgatorizeLayer_l(layer);
if (err == NO_ERROR) if (err == NO_ERROR)
setTransactionFlags(eDisplayTransactionNeeded); setTransactionFlags(eTransactionNeeded);
return err; return err;
} }