commit dbe6486ca151d0eb1950be0aae347f0eb8ed3442
author Jamie Gennis <jgennis@google.com> Sat Jul 30 14:33:49 2011 -0700
committer Jamie Gennis <jgennis@google.com> Sat Jul 30 14:38:20 2011 -0700
tree 10375a315441a9d1739d3991f20ed278a7737080
parent 8d944d254bd8054e9926ac651a7867083d36752d

SurfaceFlinger: abandon Layer SurfaceTextures

This change makes the Layer::onRemoved method call
SurfaceTextures::abandon on the layer's SurfaceTexture.  This will cause
all client-initiated operations on the SurfaceTexture to fail.  In
particular, this will result in an error on the client side, rather than
a deadlock when removing a layer that used a SurfaceTexture in
synchronous mode.

Change-Id: I14014d00369f29560a21b606831edee432bb8867
Bug: 5020874

services/surfaceflinger/Layer.cpp

diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp
index 63062cc..886bb2a 100644
--- a/services/surfaceflinger/Layer.cpp
+++ b/services/surfaceflinger/Layer.cpp
@@ -105,6 +105,7 @@
 // in the purgatory list
 void Layer::onRemoved()
 {
+    mSurfaceTexture->abandon();
 }
 
 sp<ISurface> Layer::createSurface()