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

Commit 4952ac04 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

am bc881e66: Merge "frameworks/base: Swap width and height of temporary buffer... 

am bc881e66: Merge "frameworks/base: Swap width and height of temporary buffer only with orientation change"

Merge commit 'bc881e66d15181494fdd5d0ece83e20ef325453b' into gingerbread-plus-aosp

* commit 'bc881e66d15181494fdd5d0ece83e20ef325453b':
  frameworks/base: Swap width and height of temporary buffer only with
parents 52f34da5 b203a27f

services/surfaceflinger/LayerBuffer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -495,7 +495,7 @@ status_t LayerBuffer::BufferSource::initTempBuffer() const 
    const ISurface::BufferHeap& buffers(mBufferHeap);

    uint32_t w = mLayer.mTransformedBounds.width();

    uint32_t h = mLayer.mTransformedBounds.height();

    if (buffers.w * h != buffers.h * w) {

    if (mLayer.getOrientation() & (Transform::ROT_90 | Transform::ROT_270)) {

        int t = w; w = h; h = t;

    }