From e58ebfd933bccda0cb237a26a79c85c15a374cbc Mon Sep 17 00:00:00 2001
From: Magnus Jedvert <magjed@webrtc.org>
Date: Wed, 18 Mar 2020 20:18:02 +0100
Subject: [PATCH] Android: Synchronize EGL14.eglDestroyContext calls
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bug: b/151705621
Change-Id: Iba0c5775a4bec66034484466da45de795b5ee1eb
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/170822
Reviewed-by: Sami Kalliomäki <sakal@webrtc.org>
Commit-Queue: Magnus Jedvert <magjed@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#30828}
---
 sdk/android/src/java/org/webrtc/EglBase14Impl.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sdk/android/src/java/org/webrtc/EglBase14Impl.java b/sdk/android/src/java/org/webrtc/EglBase14Impl.java
index 1c519ffde5..202b0daaaf 100644
--- a/sdk/android/src/java/org/webrtc/EglBase14Impl.java
+++ b/sdk/android/src/java/org/webrtc/EglBase14Impl.java
@@ -170,7 +170,9 @@ class EglBase14Impl implements EglBase14 {
     checkIsNotReleased();
     releaseSurface();
     detachCurrent();
-    EGL14.eglDestroyContext(eglDisplay, eglContext);
+    synchronized (EglBase.lock) {
+      EGL14.eglDestroyContext(eglDisplay, eglContext);
+    }
     EGL14.eglReleaseThread();
     EGL14.eglTerminate(eglDisplay);
     eglContext = EGL14.EGL_NO_CONTEXT;