From 015fb3fb41ffe04475ab2b604cc30cc1c031815a Mon Sep 17 00:00:00 2001 From: Mathias Agopian Date: Thu, 14 Oct 2010 12:19:37 -0700 Subject: [PATCH] may fix 3097381 and 3097482. don't abort on/off if the animation fails now that sf handles more of the screen on/off state, we don't want to abort because/if the animation fails for some reason (which will be the case on the emulator). Change-Id: I239e0a39cf8aff3074647e82db92de4a0bf0e494 --- services/surfaceflinger/SurfaceFlinger.cpp | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index 373496971..073ce01ac 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp @@ -1576,6 +1576,7 @@ status_t SurfaceFlinger::renderScreenToTextureLocked(DisplayID dpy, glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, hw_w, hw_h, 0, GL_RGB, GL_UNSIGNED_BYTE, 0); if (glGetError() != GL_NO_ERROR) { + while ( glGetError() != GL_NO_ERROR ) ; GLint tw = (2 << (31 - clz(hw_w))); GLint th = (2 << (31 - clz(hw_h))); glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, @@ -1907,11 +1908,9 @@ status_t SurfaceFlinger::turnElectronBeamOffImplLocked() // we're already off return NO_ERROR; } - status_t result = electronBeamOffAnimationImplLocked(); - if (result == NO_ERROR) { - hw.setCanDraw(false); - } - return result; + electronBeamOffAnimationImplLocked(); + hw.setCanDraw(false); + return NO_ERROR; } status_t SurfaceFlinger::turnElectronBeamOff(int32_t mode) @@ -1958,11 +1957,9 @@ status_t SurfaceFlinger::turnElectronBeamOnImplLocked() // we're already on return NO_ERROR; } - status_t result = electronBeamOnAnimationImplLocked(); - if (result == NO_ERROR) { - hw.setCanDraw(true); - } - return result; + electronBeamOnAnimationImplLocked(); + hw.setCanDraw(true); + return NO_ERROR; } status_t SurfaceFlinger::turnElectronBeamOn(int32_t mode)