Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd70b7f3 authored by Mathias Agopian's avatar Mathias Agopian Committed by Android Git Automerger
Browse files

am 121a31ac: Merge change Id86beb99 into eclair 

Merge commit '121a31ac3901fcb81c808da2b4a9a7cf66c12b7c' into eclair-mr2

* commit '121a31ac3901fcb81c808da2b4a9a7cf66c12b7c':
  fix [2291418] Camera preview cannot work in Emulator
parents a59a9d25 91e41527

libs/surfaceflinger/LayerBuffer.cpp

+15 −13
Original line number Diff line number Diff line
@@ -266,6 +266,15 @@ LayerBuffer::Buffer::Buffer(const ISurface::BufferHeap& buffers, ssize_t offset) 
    : mBufferHeap(buffers)

{

    NativeBuffer& src(mNativeBuffer);

    src.crop.l = 0;

    src.crop.t = 0;

    src.crop.r = buffers.w;

    src.crop.b = buffers.h;



    src.img.w       = buffers.hor_stride ?: buffers.w;

    src.img.h       = buffers.ver_stride ?: buffers.h;

    src.img.format  = buffers.format;

    src.img.base    = (void*)(intptr_t(buffers.heap->base()) + offset);

    src.img.handle  = 0;



    gralloc_module_t const * module = LayerBuffer::getGrallocModule();
@@ -276,17 +285,10 @@ LayerBuffer::Buffer::Buffer(const ISurface::BufferHeap& buffers, ssize_t offset) 
                offset, buffers.heap->base(),

                &src.img.handle);



        if (err == NO_ERROR) {

            src.crop.l = 0;

            src.crop.t = 0;

            src.crop.r = buffers.w;

            src.crop.b = buffers.h;



            src.img.w       = buffers.hor_stride ?: buffers.w;

            src.img.h       = buffers.ver_stride ?: buffers.h;

            src.img.format  = buffers.format;

            src.img.base    = (void*)(intptr_t(buffers.heap->base()) + offset);

        }

        LOGE_IF(err, "CREATE_HANDLE_FROM_BUFFER (heapId=%d, size=%d, "

             "offset=%ld, base=%p) failed (%s)",

                buffers.heap->heapID(), buffers.heap->getSize(),

                offset, buffers.heap->base(), strerror(-err));

    }

 }