am 75ca58d6: am 76169da0: fix [2315900] Monochrome camera preview screen after launching camera

Merge commit '75ca58d6f877541516f4f2710b4bed39fa7c4266' into eclair-mr2-plus-aosp

* commit '75ca58d6f877541516f4f2710b4bed39fa7c4266':
  fix [2315900] Monochrome camera preview screen after launching camera

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;
     };