commit 63be8ccc942bd47c8cfdbe227f9cd4c1cdad7737
author Mathias Agopian <mathias@google.com> Thu Oct 14 14:53:55 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Oct 14 14:53:55 2010 -0700
tree eda6c2484846e14b587f0bceb1660f07725d4b2e
parent 542c8ead1d148b26b438bdf443129d49fe16029a
parent a7f0373533e590fdca1400f90e6657ebb2dd5f17

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

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 073ce01..a975480 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -1915,9 +1915,6 @@
 
 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 @@
     }
     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;