summaryrefslogtreecommitdiffstats
path: root/libs/surfaceflinger/LayerBase.cpp
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-10-02 23:35:12 -0400
committerAndroid (Google) Code Review <android-gerrit@google.com>2009-10-02 23:35:12 -0400
commitf8e4bc9f7789b98b54fe04df56555ca8c630df70 (patch)
tree21ffd2455c4ce35e916cb9361b767db13aac7903 /libs/surfaceflinger/LayerBase.cpp
parent8df16d63d4e1c70cf75a9acc4f24e4e1abca5abc (diff)
parent0c4cec7e4df87181486d280c98fba9c0f4774c37 (diff)
downloadframeworks_base-f8e4bc9f7789b98b54fe04df56555ca8c630df70.zip
frameworks_base-f8e4bc9f7789b98b54fe04df56555ca8c630df70.tar.gz
frameworks_base-f8e4bc9f7789b98b54fe04df56555ca8c630df70.tar.bz2
Merge change I0c4cec7e into eclair
* changes: Attempt to fix [2152536] ANR in browser
Diffstat (limited to 'libs/surfaceflinger/LayerBase.cpp')
-rw-r--r--libs/surfaceflinger/LayerBase.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/libs/surfaceflinger/LayerBase.cpp b/libs/surfaceflinger/LayerBase.cpp
index d83c842..83814cc 100644
--- a/libs/surfaceflinger/LayerBase.cpp
+++ b/libs/surfaceflinger/LayerBase.cpp
@@ -690,6 +690,14 @@ sp<LayerBaseClient::Surface> LayerBaseClient::createSurface() const
const_cast<LayerBaseClient *>(this));
}
+// called with SurfaceFlinger::mStateLock as soon as the layer is entered
+// in the purgatory list
+void LayerBaseClient::onRemoved()
+{
+ // wake up the condition
+ lcblk->setStatus(NO_INIT);
+}
+
// ---------------------------------------------------------------------------
LayerBaseClient::Surface::Surface(
@@ -700,7 +708,6 @@ LayerBaseClient::Surface::Surface(
{
}
-
LayerBaseClient::Surface::~Surface()
{
/*