Merge "may fix 3097381 and 3097482. don't abort on/off if the animation fails" into gingerbread (295c7002) · Commits · e / os / android_frameworks_native

services/surfaceflinger/SurfaceFlinger.cpp

+7 −10

Original line number	Diff line number	Diff line
		@@ -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) {
		electronBeamOffAnimationImplLocked();
		hw.setCanDraw(false);
		}
		return result;
		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) {
		electronBeamOnAnimationImplLocked();
		hw.setCanDraw(true);
		}
		return result;
		return NO_ERROR;
		}

		status_t SurfaceFlinger::turnElectronBeamOn(int32_t mode)