diff options
| author | 2009-09-23 20:03:41 -0400 | |
|---|---|---|
| committer | 2009-09-23 20:03:41 -0400 | |
| commit | 6e35b50e8d77ff16ffbcac88f421c7091d1c9b8c (patch) | |
| tree | 8f17093a9c3ca4c452ce933087155c4249b86982 /libs/surfaceflinger/Layer.cpp | |
| parent | 2cca29a333eb2d29d4f7cceb5e73313d7857ca82 (diff) | |
| parent | 2e4b68d57bb64d7e93139238c5a8be91ff956c2a (diff) | |
Merge change 26715 into eclair
* changes:
fix [2133214] STOPSHIP: revert I4a06bb4f: workaround for [2113743] Sholes: frozen then runtime restart going to list view
Diffstat (limited to 'libs/surfaceflinger/Layer.cpp')
| -rw-r--r-- | libs/surfaceflinger/Layer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/surfaceflinger/Layer.cpp b/libs/surfaceflinger/Layer.cpp index 5ff928439aa7..8dfc2cf766b9 100644 --- a/libs/surfaceflinger/Layer.cpp +++ b/libs/surfaceflinger/Layer.cpp @@ -88,6 +88,7 @@ void Layer::destroy() mBuffers[i].clear(); mWidth = mHeight = 0; } + mSurface.clear(); } sp<LayerBaseClient::Surface> Layer::createSurface() const @@ -98,8 +99,7 @@ sp<LayerBaseClient::Surface> Layer::createSurface() const status_t Layer::ditch() { // the layer is not on screen anymore. free as much resources as possible - //destroy(); - mSurface.clear(); + destroy(); return NO_ERROR; } |