commit 94c0f2645e2ae6221d8cefe20a3d048387e27000
author Magnus Jedvert <magjed@webrtc.org> Wed Dec 12 16:35:28 2018
committer Commit Bot <commit-bot@chromium.org> Thu Dec 13 09:31:41 2018
tree 57261db8f69820f9aa930488e077bcbc9a4f8fd4
parent 2aa037990f35e063ac6cb8160690c9d28880bfe3

Android: One weird trick for avoiding graphics deadlocks

eglDestroyContext has been observed to deadlock with other GL threads
unless the GL program is detached beforehand.

TBR=sakal
NO_TRY=TRUE

Bug: b/120481228
Change-Id: Ie256e745828997b6fee0d62e681f5ef953aa0fe7
Reviewed-on: https://webrtc-review.googlesource.com/c/114164
Reviewed-by: Magnus Jedvert <magjed@webrtc.org>
Commit-Queue: Magnus Jedvert <magjed@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25999}

sdk/android/api/org/webrtc/EglRenderer.java

diff --git a/sdk/android/api/org/webrtc/EglRenderer.java b/sdk/android/api/org/webrtc/EglRenderer.java
index c56798b..c369527 100644
--- a/sdk/android/api/org/webrtc/EglRenderer.java
+++ b/sdk/android/api/org/webrtc/EglRenderer.java
@@ -274,6 +274,8 @@
       renderThreadHandler.removeCallbacks(logStatisticsRunnable);
       // Release EGL and GL resources on render thread.
       renderThreadHandler.postAtFrontOfQueue(() -> {
+        // Detach current shader program.
+        GLES20.glUseProgram(/* program= */ 0);
         if (drawer != null) {
           drawer.release();
           drawer = null;