ADHOC
/
replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am b0e020ab: Merge "may fix 3097381 and 3097482. don\'t abort on/off if the animation fails" into gingerbread 

Merge commit 'b0e020ab409b725a556f2c5043b08c9bac2c29bf' into gingerbread-plus-aosp

* commit 'b0e020ab409b725a556f2c5043b08c9bac2c29bf':
  may fix 3097381 and 3097482. don't abort on/off if the animation fails
This commit is contained in:
Mathias Agopian 2010-10-14 13:41:28 -07:00 committed by Android Git Automerger
parent cf0c0110ea 295c7002f6
commit a310993c83
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
services/surfaceflinger/SurfaceFlinger.cpp
View File

@ -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)