From 480f73748dda46e586f0b47fc18a61f65dae1262 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 13 Sep 2019 13:46:02 +0100
Subject: [PATCH] Upgrade to OkHttp 3.12.5

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

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index e701a89d6c..0339756923 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -22,7 +22,9 @@
   ([#6398](https://github.com/google/ExoPlayer/issues/6398)).
 * Fix `PlayerNotificationManager` to show play icon rather than pause icon when
   playback is ended ([#6324](https://github.com/google/ExoPlayer/issues/6324)).
-* Upgrade LibRtmp-Client-for-Android to fix RTMP playback issues
+* OkHttp extension: Upgrade OkHttp to fix HTTP2 socket timeout issue
+  ([#4078](https://github.com/google/ExoPlayer/issues/4078)).
+* RTMP extension: Upgrade LibRtmp-Client-for-Android to fix RTMP playback issues
   ([#4200](https://github.com/google/ExoPlayer/issues/4200),
   [#4249](https://github.com/google/ExoPlayer/issues/4249),
   [#4319](https://github.com/google/ExoPlayer/issues/4319),
diff --git a/extensions/okhttp/build.gradle b/extensions/okhttp/build.gradle
index 68bd422185..2395aedd46 100644
--- a/extensions/okhttp/build.gradle
+++ b/extensions/okhttp/build.gradle
@@ -35,7 +35,7 @@ dependencies {
     implementation project(modulePrefix + 'library-core')
     implementation 'androidx.annotation:annotation:1.1.0'
     compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
-    api 'com.squareup.okhttp3:okhttp:3.12.1'
+    api 'com.squareup.okhttp3:okhttp:3.12.5'
 }
 
 ext {