From f6c8206735e7e078461e5f2aef6e1a1446fdd075 Mon Sep 17 00:00:00 2001 From: Mathias Agopian Date: Tue, 7 Jun 2011 14:52:22 -0700 Subject: fix a surface leak introduced by a failed merge (DO NOT MERGE) Bug: 4558502 Change-Id: Ibf889d03caa806c34603ad45f135b78c3851f55c --- services/surfaceflinger/SurfaceFlinger.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'services/surfaceflinger/SurfaceFlinger.cpp') diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index 9a312a7369fe..a7b58576924c 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp @@ -1389,6 +1389,14 @@ status_t SurfaceFlinger::destroySurface(const wp& 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)); } -- cgit v1.2.3-59-g8ed1b