From 8ab8b86a7b3a12fb869ecb53f4135310d95ba66e Mon Sep 17 00:00:00 2001 From: andrewlewis Date: Wed, 20 Jun 2018 10:38:00 -0700 Subject: [PATCH] Fully clean up resources in EGLSurfaceTexture ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=201376315 --- .../com/google/android/exoplayer2/util/EGLSurfaceTexture.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/EGLSurfaceTexture.java b/library/core/src/main/java/com/google/android/exoplayer2/util/EGLSurfaceTexture.java index 51e8f69679..5324a0b3da 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/util/EGLSurfaceTexture.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/util/EGLSurfaceTexture.java @@ -145,6 +145,10 @@ public final class EGLSurfaceTexture implements SurfaceTexture.OnFrameAvailableL if (context != null) { EGL14.eglDestroyContext(display, context); } + // EGL14.eglReleaseThread could crash before Android K (see [internal: b/11327779]). + if (Util.SDK_INT >= 19) { + EGL14.eglReleaseThread(); + } display = null; context = null; surface = null;