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

Merge commit 'a8faf91fa558be1235d508e776eb24be4429585c'

* commit 'a8faf91fa558be1235d508e776eb24be4429585c':
  fix [3095607] Gingerbread screen turn-on animation does not show the last frame
This commit is contained in:
Mathias Agopian 2010-10-16 08:52:12 -07:00 committed by Android Git Automerger
commit 1cc53746aa
1 changed files with 5 additions and 6 deletions

View File

@ -2022,9 +2022,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;
@ -2066,14 +2063,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;