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

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

am 6d71f6a0: Merge "fix [3095607] Gingerbread screen turn-on animation does... 

am 6d71f6a0: Merge "fix [3095607] Gingerbread screen turn-on animation does not show the last frame" into gingerbread

Merge commit '6d71f6a0' into gingerbread-plus-aosp

* commit '6d71f6a0':
  fix [3095607] Gingerbread screen turn-on animation does not show the last frame
parents b7f8032a 6d71f6a0

services/surfaceflinger/SurfaceFlinger.cpp

+5 −6
Original line number Diff line number Diff line
@@ -1915,9 +1915,6 @@ status_t SurfaceFlinger::turnElectronBeamOffImplLocked() 


status_t SurfaceFlinger::turnElectronBeamOff(int32_t mode)

{

    if (!GLExtensions::getInstance().haveFramebufferObject())

        return INVALID_OPERATION;



    class MessageTurnElectronBeamOff : public MessageBase {

        SurfaceFlinger* flinger;

        status_t result;
@@ -1959,14 +1956,16 @@ status_t SurfaceFlinger::turnElectronBeamOnImplLocked() 
    }

    electronBeamOnAnimationImplLocked();

    hw.setCanDraw(true);



    // make sure to redraw the whole screen when the animation is done

    mDirtyRegion.set(hw.bounds());

    signalEvent();



    return NO_ERROR;

}



status_t SurfaceFlinger::turnElectronBeamOn(int32_t mode)

{

    if (!GLExtensions::getInstance().haveFramebufferObject())

        return INVALID_OPERATION;



    class MessageTurnElectronBeamOn : public MessageBase {

        SurfaceFlinger* flinger;

        status_t result;