summaryrefslogtreecommitdiffstats
path: root/libs/surfaceflinger/Layer.cpp
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2009-09-23 16:44:00 -0700
committerMathias Agopian <mathias@google.com>2009-09-23 16:59:57 -0700
commit2e4b68d57bb64d7e93139238c5a8be91ff956c2a (patch)
tree7604a70e3ed76b71cd472c8f1320719cd5bbc835 /libs/surfaceflinger/Layer.cpp
parentbc7261130a51dc9f3461d3970eee1b923bcbf193 (diff)
downloadframeworks_base-2e4b68d57bb64d7e93139238c5a8be91ff956c2a.zip
frameworks_base-2e4b68d57bb64d7e93139238c5a8be91ff956c2a.tar.gz
frameworks_base-2e4b68d57bb64d7e93139238c5a8be91ff956c2a.tar.bz2
fix [2133214] STOPSHIP: revert I4a06bb4f: workaround for [2113743] Sholes: frozen then runtime restart going to list view
Revert "workaround for [2113743] Sholes: frozen then runtime restart going to list view" This reverts commit 4a06bb4f3355b0ef2b76aa883704da9d154c44ae.
Diffstat (limited to 'libs/surfaceflinger/Layer.cpp')
-rw-r--r--libs/surfaceflinger/Layer.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/surfaceflinger/Layer.cpp b/libs/surfaceflinger/Layer.cpp
index 5ff9284..8dfc2cf 100644
--- a/libs/surfaceflinger/Layer.cpp
+++ b/libs/surfaceflinger/Layer.cpp
@@ -88,6 +88,7 @@ void Layer::destroy()
mBuffers[i].clear();
mWidth = mHeight = 0;
}
+ mSurface.clear();
}
sp<LayerBaseClient::Surface> Layer::createSurface() const
@@ -98,8 +99,7 @@ sp<LayerBaseClient::Surface> Layer::createSurface() const
status_t Layer::ditch()
{
// the layer is not on screen anymore. free as much resources as possible
- //destroy();
- mSurface.clear();
+ destroy();
return NO_ERROR;
}