diff options
author | Mathias Agopian <mathias@google.com> | 2011-04-15 18:15:13 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-04-15 18:15:13 -0700 |
commit | 644c4f186259cd26a2fb1e5be3ce32d891adc7af (patch) | |
tree | 465571d42648f723fb1d857c8d8b0c249a1d6650 /services | |
parent | 19e4be42616c7a337229a9a17dc982374dec8980 (diff) | |
parent | 5f05f99aaedaba18c426fac287bcb18d56dbe881 (diff) | |
download | frameworks_base-644c4f186259cd26a2fb1e5be3ce32d891adc7af.zip frameworks_base-644c4f186259cd26a2fb1e5be3ce32d891adc7af.tar.gz frameworks_base-644c4f186259cd26a2fb1e5be3ce32d891adc7af.tar.bz2 |
Merge "Fix a GraphicBuffer leak in SurfaceTexture"
Diffstat (limited to 'services')
-rw-r--r-- | services/surfaceflinger/SurfaceFlinger.cpp | 13 | ||||
-rw-r--r-- | services/surfaceflinger/SurfaceFlinger.h | 6 |
2 files changed, 0 insertions, 19 deletions
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index ea283c6..2f3a144 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp @@ -2553,22 +2553,9 @@ sp<GraphicBuffer> GraphicBufferAlloc::createGraphicBuffer(uint32_t w, uint32_t h LOGE("createGraphicBuffer: unable to create GraphicBuffer"); return 0; } - Mutex::Autolock _l(mLock); - mBuffers.add(graphicBuffer); return graphicBuffer; } -void GraphicBufferAlloc::freeAllGraphicBuffersExcept(int bufIdx) { - Mutex::Autolock _l(mLock); - if (bufIdx >= 0 && size_t(bufIdx) < mBuffers.size()) { - sp<GraphicBuffer> b(mBuffers[bufIdx]); - mBuffers.clear(); - mBuffers.add(b); - } else { - mBuffers.clear(); - } -} - // --------------------------------------------------------------------------- GraphicPlane::GraphicPlane() diff --git a/services/surfaceflinger/SurfaceFlinger.h b/services/surfaceflinger/SurfaceFlinger.h index 0964848..8d43157 100644 --- a/services/surfaceflinger/SurfaceFlinger.h +++ b/services/surfaceflinger/SurfaceFlinger.h @@ -125,14 +125,8 @@ class GraphicBufferAlloc : public BnGraphicBufferAlloc public: GraphicBufferAlloc(); virtual ~GraphicBufferAlloc(); - virtual sp<GraphicBuffer> createGraphicBuffer(uint32_t w, uint32_t h, PixelFormat format, uint32_t usage); - virtual void freeAllGraphicBuffersExcept(int bufIdx); - -private: - Vector<sp<GraphicBuffer> > mBuffers; - Mutex mLock; }; // --------------------------------------------------------------------------- |