diff options
| author | Steve Pfetsch <spfetsch@google.com> | 2016-10-25 21:47:58 +0000 |
|---|---|---|
| committer | Steve Pfetsch <spfetsch@google.com> | 2016-10-25 21:47:58 +0000 |
| commit | 598f6d5429b290f33107ef678328914b99c8312e (patch) | |
| tree | 9eaf861e6c13fde116a3c9d155f67ca94cd78445 | |
| parent | 1d3df546d5ee4dcc9e7cae6f8b8b790f741539af (diff) | |
| download | native-598f6d5429b290f33107ef678328914b99c8312e.tar.gz | |
Revert "services: surfaceflinger: ASAN fix"
This reverts commit 1d3df546d5ee4dcc9e7cae6f8b8b790f741539af.
Original patch may have caused a stability issue caught in monkey testing.
Bug: 32312240
Change-Id: Ie8d291679590e624b8b90c4786b1c25c76cb2c9f
| -rw-r--r-- | services/surfaceflinger/SurfaceFlinger.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index db52d40214..8db071ed2f 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp @@ -1768,12 +1768,9 @@ void SurfaceFlinger::updateCursorAsync() void SurfaceFlinger::commitTransaction() { - sp<const DisplayDevice> hw = getDefaultDisplayDevice(); - - if (!mLayersPendingRemoval.isEmpty() && hw->isDisplayOn()) { + if (!mLayersPendingRemoval.isEmpty()) { // Notify removed layers now that they can't be drawn from for (size_t i = 0; i < mLayersPendingRemoval.size(); i++) { - mCurrentState.layersSortedByZ.remove(mLayersPendingRemoval[i]); recordBufferingStats(mLayersPendingRemoval[i]->getName().string(), mLayersPendingRemoval[i]->getOccupancyHistory(true)); mLayersPendingRemoval[i]->onRemoved(); @@ -2220,10 +2217,14 @@ status_t SurfaceFlinger::removeLayer(const wp<Layer>& weakLayer) { return NO_ERROR; } - mLayersPendingRemoval.push(layer); - mLayersRemoved = true; - setTransactionFlags(eTransactionNeeded); - return NO_ERROR; + ssize_t index = mCurrentState.layersSortedByZ.remove(layer); + if (index >= 0) { + mLayersPendingRemoval.push(layer); + mLayersRemoved = true; + setTransactionFlags(eTransactionNeeded); + return NO_ERROR; + } + return status_t(index); } uint32_t SurfaceFlinger::peekTransactionFlags(uint32_t /* flags */) { |