Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Merge commit '6d71f6a0ae9fd81ce25562aee67f841b5d8394cf' into gingerbread-plus-aosp

* commit '6d71f6a0ae9fd81ce25562aee67f841b5d8394cf':
  fix [3095607] Gingerbread screen turn-on animation does not show the last frame
This commit is contained in:
Mathias Agopian
2010-10-14 15:01:23 -07:00
committed by Android Git Automerger
parent b7f8032a7e 6d71f6a0ae
commit a8faf91fa5
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/surfaceflinger/SurfaceFlinger.cpp
View File

@@ -1915,9 +1915,6 @@ status_t SurfaceFlinger::turnElectronBeamOffImplLocked()
status_t SurfaceFlinger::turnElectronBeamOff(int32_t mode) status_t SurfaceFlinger::turnElectronBeamOff(int32_t mode)
{ {
if (!GLExtensions::getInstance().haveFramebufferObject())
return INVALID_OPERATION;
class MessageTurnElectronBeamOff : public MessageBase { class MessageTurnElectronBeamOff : public MessageBase {
SurfaceFlinger* flinger; SurfaceFlinger* flinger;
status_t result; status_t result;
@@ -1959,14 +1956,16 @@ status_t SurfaceFlinger::turnElectronBeamOnImplLocked()
} }
electronBeamOnAnimationImplLocked(); electronBeamOnAnimationImplLocked();
hw.setCanDraw(true); hw.setCanDraw(true);
// make sure to redraw the whole screen when the animation is done
mDirtyRegion.set(hw.bounds());
signalEvent();
return NO_ERROR; return NO_ERROR;
} }
status_t SurfaceFlinger::turnElectronBeamOn(int32_t mode) status_t SurfaceFlinger::turnElectronBeamOn(int32_t mode)
{ {
if (!GLExtensions::getInstance().haveFramebufferObject())
return INVALID_OPERATION;
class MessageTurnElectronBeamOn : public MessageBase { class MessageTurnElectronBeamOn : public MessageBase {
SurfaceFlinger* flinger; SurfaceFlinger* flinger;
status_t result; status_t result;