OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8de47a2
)
fix a surface leak introduced by a failed merge (DO NOT MERGE)
author
Mathias Agopian
<mathias@google.com>
Tue, 7 Jun 2011 21:52:22 +0000
(14:52 -0700)
committer
Mathias Agopian
<mathias@google.com>
Tue, 7 Jun 2011 21:52:22 +0000
(14:52 -0700)
Bug:
4558502
Change-Id: Ibf889d03caa806c34603ad45f135b78c3851f55c
services/surfaceflinger/SurfaceFlinger.cpp
patch
|
blob
|
history
diff --git
a/services/surfaceflinger/SurfaceFlinger.cpp
b/services/surfaceflinger/SurfaceFlinger.cpp
index
9a312a7
..
a7b5857
100644
(file)
--- a/
services/surfaceflinger/SurfaceFlinger.cpp
+++ b/
services/surfaceflinger/SurfaceFlinger.cpp
@@
-1389,6
+1389,14
@@
status_t SurfaceFlinger::destroySurface(const wp<LayerBaseClient>& layer)
if (l != NULL) {
Mutex::Autolock _l(mStateLock);
err = removeLayer_l(l);
+ if (err == NAME_NOT_FOUND) {
+ // The surface wasn't in the current list, which means it was
+ // removed already, which means it is in the purgatory,
+ // and need to be removed from there.
+ ssize_t idx = mLayerPurgatory.remove(l);
+ LOGE_IF(idx < 0,
+ "layer=%p is not in the purgatory list", l.get());
+ }
LOGE_IF(err<0 && err != NAME_NOT_FOUND,
"error removing layer=%p (%s)", l.get(), strerror(-err));
}