summaryrefslogtreecommitdiff
path: root/libs/surfaceflinger/Layer.cpp
diff options
context:
space:
mode:
author Android (Google) Code Review <android-gerrit@google.com> 2009-09-20 20:12:30 -0400
committer Android (Google) Code Review <android-gerrit@google.com> 2009-09-20 20:12:30 -0400
commitc6a22beff2af0590c1d76342bf57853f2bc85ff8 (patch)
tree97c78bbb58f82fe22e417b10dbb3eac5ce5aff56 /libs/surfaceflinger/Layer.cpp
parent5ea916b17cf0071f4d49936a370f4b873e4eb3e3 (diff)
parent4a06bb4f3355b0ef2b76aa883704da9d154c44ae (diff)
Merge change 26081 into eclair
* changes: workaround for [2113743] Sholes: frozen then runtime restart going to list view
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 8dfc2cf766b9..5ff928439aa7 100644
--- a/libs/surfaceflinger/Layer.cpp
+++ b/libs/surfaceflinger/Layer.cpp
@@ -88,7 +88,6 @@ void Layer::destroy()
mBuffers[i].clear();
mWidth = mHeight = 0;
}
- mSurface.clear();
}
sp<LayerBaseClient::Surface> Layer::createSurface() const
@@ -99,7 +98,8 @@ sp<LayerBaseClient::Surface> Layer::createSurface() const
status_t Layer::ditch()
{
// the layer is not on screen anymore. free as much resources as possible
- destroy();
+ //destroy();
+ mSurface.clear();
return NO_ERROR;
}