summaryrefslogtreecommitdiff
path: root/services/surfaceflinger/LayerBase.cpp
diff options
context:
space:
mode:
author Mathias Agopian <mathias@google.com> 2011-06-06 15:21:44 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2011-06-06 15:21:44 -0700
commitc1cbf4525b4d12b6cb7908072d36c8f6ca819f5b (patch)
treece173c0b5701869e56fb967aa76185b4ab592131 /services/surfaceflinger/LayerBase.cpp
parente9d32283e4eca1ee27218ed66f754a694678ac6d (diff)
parent24855c09173a6caaec7dcedd0c2d7ce15121d39b (diff)
am 24855c09: merge various SF fixes from gingerbread to honeycomb-mr2 (DO NOT MERGE)
* commit '24855c09173a6caaec7dcedd0c2d7ce15121d39b': 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.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/services/surfaceflinger/LayerBase.cpp b/services/surfaceflinger/LayerBase.cpp
index 6025ed4921cb..022f25145297 100644
--- a/services/surfaceflinger/LayerBase.cpp
+++ b/services/surfaceflinger/LayerBase.cpp
@@ -616,10 +616,7 @@ LayerBaseClient::Surface::~Surface()
*/
// destroy client resources
- sp<LayerBaseClient> layer = getOwner();
- if (layer != 0) {
- mFlinger->destroySurface(layer);
- }
+ mFlinger->destroySurface(mOwner);
}
sp<LayerBaseClient> LayerBaseClient::Surface::getOwner() const {