From debc234c242cfe30f9447f017d13bb4da89527c3 Mon Sep 17 00:00:00 2001 From: Mathias Agopian Date: Thu, 16 Jun 2011 17:15:51 -0700 Subject: Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE) Also revert all dependent changes: This reverts commit 8e18668d14adf601cbe5973030c310ec23d88461. This reverts commit 69b4587bfbb3e98f793959d9123340360fa233a2. This reverts commit a9c9a4baf24700e8817d47d8ea8da1742caea0b5. This reverts commit 2c0042b666a969091c931614f2fc0dce2f1cfac8. This reverts commit f6c8206735e7e078461e5f2aef6e1a1446fdd075. This reverts commit 24855c09173a6caaec7dcedd0c2d7ce15121d39b. Change-Id: I33e699640f3f59e42fa03c99a9a1b7af0d27d4d8 --- services/surfaceflinger/LayerBase.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'services/surfaceflinger/LayerBase.cpp') 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 layer = getOwner(); + if (layer != 0) { + mFlinger->destroySurface(layer); + } } sp LayerBaseClient::Surface::getOwner() const { -- cgit v1.2.3-59-g8ed1b