diff options
| author | 2011-01-26 12:41:02 -0800 | |
|---|---|---|
| committer | 2011-01-26 12:41:02 -0800 | |
| commit | a0f40033c03a0b64538bf1c22f83d3c9a325ff87 (patch) | |
| tree | 9a9385bf9ff3f266c08ef60f4aa2e4674975d111 /services/surfaceflinger/SurfaceFlinger.cpp | |
| parent | 2c070bae4493cd1976c5086ec4cbf6ce10482742 (diff) | |
| parent | d35c6667c8233385f31aa203f486b2cb826bf6be (diff) | |
Merge "fix [3385504] Surface flinger hang when adding dim surface" into honeycomb
Diffstat (limited to 'services/surfaceflinger/SurfaceFlinger.cpp')
| -rw-r--r-- | services/surfaceflinger/SurfaceFlinger.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index 291ebc57043c..87b66eafa985 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp @@ -1088,7 +1088,7 @@ status_t SurfaceFlinger::removeLayer_l(const sp<LayerBase>& layerBase) { sp<LayerBaseClient> lbc(layerBase->getLayerBaseClient()); if (lbc != 0) { - mLayerMap.removeItem( lbc->getSurface()->asBinder() ); + mLayerMap.removeItem( lbc->getSurfaceBinder() ); } ssize_t index = mCurrentState.layersSortedByZ.remove(layerBase); if (index >= 0) { |