diff options
| author | 2009-12-10 17:40:41 -0800 | |
|---|---|---|
| committer | 2009-12-10 17:40:41 -0800 | |
| commit | 75ca58d6f877541516f4f2710b4bed39fa7c4266 (patch) | |
| tree | be55b2cc1e100589fa765c1d7042cab519126acd /libs/surfaceflinger/LayerBuffer.h | |
| parent | 6608bd0d3af3f9c365b73f8b19d9ec0b7d5ee70b (diff) | |
| parent | 76169da0e84b0fcf621aeac6141af3ee85bc7c1e (diff) | |
am 76169da0: fix [2315900] Monochrome camera preview screen after launching camera
Merge commit '76169da0e84b0fcf621aeac6141af3ee85bc7c1e' into eclair-mr2
* commit '76169da0e84b0fcf621aeac6141af3ee85bc7c1e':
fix [2315900] Monochrome camera preview screen after launching camera
Diffstat (limited to 'libs/surfaceflinger/LayerBuffer.h')
| -rw-r--r-- | libs/surfaceflinger/LayerBuffer.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/surfaceflinger/LayerBuffer.h b/libs/surfaceflinger/LayerBuffer.h index 1abb103a674a..2ca63aca7a38 100644 --- a/libs/surfaceflinger/LayerBuffer.h +++ b/libs/surfaceflinger/LayerBuffer.h @@ -130,13 +130,14 @@ private: virtual bool transformed() const; virtual void destroy() { } private: + status_t initTempBuffer() const; mutable Mutex mBufferSourceLock; sp<Buffer> mBuffer; status_t mStatus; ISurface::BufferHeap mBufferHeap; size_t mBufferSize; mutable LayerBase::Texture mTexture; - NativeBuffer mTempBuffer; + mutable NativeBuffer mTempBuffer; mutable sp<GraphicBuffer> mTempGraphicBuffer; }; |