From bf9a61d62f93e07ba2d7429b76568318b4457a97 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 8 Jan 2020 09:10:41 +0000
Subject: [PATCH] Upgrade OkHttp library to fix HTTP2 issue

Issue: #4078
PiperOrigin-RevId: 288651166
---
 RELEASENOTES.md                | 3 +++
 extensions/okhttp/build.gradle | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index bcd6de8029..f33475f4d6 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -25,6 +25,9 @@
   * Improve support for G.711 A-law and mu-law encoded data.
 * Fix MKV subtitles to disappear when intended instead of lasting until the
   next cue ([#6833](https://github.com/google/ExoPlayer/issues/6833)).
+* OkHttp extension: Upgrade OkHttp dependency to 3.12.7, which fixes a class of
+  `SocketTimeoutException` issues when using HTTP/2
+  ([#4078](https://github.com/google/ExoPlayer/issues/4078)).
 
 ### 2.11.1 (2019-12-20) ###
 
diff --git a/extensions/okhttp/build.gradle b/extensions/okhttp/build.gradle
index bde4e127df..2b4b4854c3 100644
--- a/extensions/okhttp/build.gradle
+++ b/extensions/okhttp/build.gradle
@@ -41,7 +41,7 @@ dependencies {
     // https://cashapp.github.io/2019-02-05/okhttp-3-13-requires-android-5
     // Since OkHttp is distributed as a jar rather than an aar, Gradle won't
     // stop us from making this mistake!
-    api 'com.squareup.okhttp3:okhttp:3.12.5'
+    api 'com.squareup.okhttp3:okhttp:3.12.7'
 }
 
 ext {