diff options
| author | 2011-06-16 18:09:56 -0700 | |
|---|---|---|
| committer | 2011-06-16 18:09:56 -0700 | |
| commit | f588d1dc95b02628c275d7d900f4dd2b83d87bbd (patch) | |
| tree | cc677d7f751d9900458c481845dead6e9404d065 /services/surfaceflinger/LayerBase.cpp | |
| parent | 0fcbbddfcfe44e4ed132f7fd41186f4789de3aa0 (diff) | |
| parent | debc234c242cfe30f9447f017d13bb4da89527c3 (diff) | |
am e7d3ee9d: Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)
* commit 'e7d3ee9d81de13e992c7d063ca472d480956b0c6':
Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)
Diffstat (limited to 'services/surfaceflinger/LayerBase.cpp')
| -rw-r--r-- | services/surfaceflinger/LayerBase.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/services/surfaceflinger/LayerBase.cpp b/services/surfaceflinger/LayerBase.cpp index 022f251452..6025ed4921 100644 --- a/services/surfaceflinger/LayerBase.cpp +++ b/services/surfaceflinger/LayerBase.cpp @@ -616,7 +616,10 @@ LayerBaseClient::Surface::~Surface() */ // destroy client resources - mFlinger->destroySurface(mOwner); + sp<LayerBaseClient> layer = getOwner(); + if (layer != 0) { + mFlinger->destroySurface(layer); + } } sp<LayerBaseClient> LayerBaseClient::Surface::getOwner() const { |