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

Merge "camera2/legacy: Fix expected errors on eglSwapBuffers" into pi-dev

Browse Source 
am: a973d530df

Change-Id: I4d494dc9d6a6e9043129ce09101bcfb81a8f869e
This commit is contained in:
android-build-team Robot
2018-04-27 11:35:00 -07:00
committed by android-build-merger
parent b734ceb93b a973d530df
commit 437e39316b
1 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
core/java/android/hardware/camera2/legacy/SurfaceTextureRenderer.java
View File

@@ -529,14 +529,32 @@ public class SurfaceTextureRenderer {
private boolean swapBuffers(EGLSurface surface)
throws LegacyExceptionUtils.BufferQueueAbandonedException {
boolean result = EGL14.eglSwapBuffers(mEGLDisplay, surface);
int error = EGL14.eglGetError();
if (error == EGL14.EGL_BAD_SURFACE) {
throw new LegacyExceptionUtils.BufferQueueAbandonedException();
} else if (error != EGL14.EGL_SUCCESS) {
throw new IllegalStateException("swapBuffers: EGL error: 0x" +
Integer.toHexString(error));
switch (error) {
case EGL14.EGL_SUCCESS:
return result;
// Check for an abandoned buffer queue, or other error conditions out
// of the user's control.
//
// From the EGL 1.4 spec (2013-12-04), Section 3.9.4 Posting Errors:
//
// If eglSwapBuffers is called and the native window associated with
// surface is no longer valid, an EGL_BAD_NATIVE_WINDOW error is
// generated.
//
// We also interpret EGL_BAD_SURFACE as indicating an abandoned
// surface, even though the EGL spec does not document it as such, for
// backwards compatibility with older versions of this file.
case EGL14.EGL_BAD_NATIVE_WINDOW:
case EGL14.EGL_BAD_SURFACE:
throw new LegacyExceptionUtils.BufferQueueAbandonedException();
default:
throw new IllegalStateException(
"swapBuffers: EGL error: 0x" + Integer.toHexString(error));
}
return result;
}
private void checkEglError(String msg) {