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

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

am a31deaf4: Merge change 21225 into eclair 

Merge commit 'a31deaf4'

* commit 'a31deaf4':
  fix a bug that could cause a window to be hidden in some cases.
parents 7c2eb4c6 a31deaf4

libs/surfaceflinger/Layer.cpp

+6 −1
Original line number Original line Diff line number Diff line
@@ -596,7 +596,12 @@ Region Layer::post(uint32_t* previousSate, bool& recomputeVisibleRegions) 
Point Layer::getPhysicalSize() const

Point Layer::getPhysicalSize() const

{

{

    sp<const Buffer> front(frontBuffer().getBuffer());

    sp<const Buffer> front(frontBuffer().getBuffer());

    return Point(front->getWidth(), front->getHeight());

    Point size(front->getWidth(), front->getHeight());

    if ((size.x | size.y) == 0) {

        // if we don't have a buffer yet, just use the state's size.

        size = LayerBase::getPhysicalSize();

    }

    return size;

}

}





void Layer::unlockPageFlip(

void Layer::unlockPageFlip(