From 5e88837ecc352dbcb7ae00842c59f5a298fc9a5b Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 10 Jun 2021 17:18:13 +0100
Subject: [PATCH] Bump version to 2.14.1 and tidy release notes

PiperOrigin-RevId: 378665771
---
 RELEASENOTES.md                               | 23 +++++++++++--------
 constants.gradle                              |  4 ++--
 .../exoplayer2/ExoPlayerLibraryInfo.java      |  6 ++---
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index b0f4686a66..30eee5883b 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -1,6 +1,6 @@
 # Release notes
 
-### 2.14.1 (not yet released)
+### 2.14.1 (2021-06-11)
 
 *   Core Library:
     *   Fix gradle config to allow specifying a relative path for
@@ -17,16 +17,12 @@
         swapping the output `Surface` and a mixture of secure and non-secure
         content being played
         ([#8776](https://github.com/google/ExoPlayer/issues/8776)).
-*   HLS
+*   HLS:
     *   Use the `PRECISE` attribute in `EXT-X-START` to select the default start
         position.
     *   Fix a bug where skipping into spliced-in chunks triggered an assertion
-        error ([#8937](https://github.com/google/ExoPlayer/issues/8937).
+        error ([#8937](https://github.com/google/ExoPlayer/issues/8937)).
 *   DRM:
-    *   Don't restore offline keys before releasing them. In OEMCrypto v16+ keys
-        must be released without restoring them first.
-    *   Ensure `DefaultDrmSession` instances keep working even after their
-        `DefaultDrmSessionManager` instance is released.
     *   Keep secure `MediaCodec` instances initialized when disabling (but not
         resetting) `MediaCodecRenderer`. This helps re-use secure decoders in
         more contexts, which avoids the 'black flash' caused by detaching a
@@ -34,19 +30,26 @@
         ([#8842](https://github.com/google/ExoPlayer/issues/8842)). It will also
         result in DRM license refresh network requests while the player is
         stopped if `Player#setForegroundMode` is true.
+    *   Fix issue where offline keys were unnecessarily (and incorrectly)
+        restored into a session before being released. This call sequence is
+        explicitly disallowed in OEMCrypto v16.
 *   UI:
     *   Keep subtitle language features embedded (e.g. rubies & tate-chu-yoko)
         in `Cue.text` even when `SubtitleView#setApplyEmbeddedStyles()` is
-        false.
+        `false`.
     *   Fix `NullPointerException` in `StyledPlayerView` that could occur after
         calling `StyledPlayerView.setPlayer(null)`
         ([#8985](https://github.com/google/ExoPlayer/issues/8985)).
 *   RTSP:
-    *   Add support for RTSP basic and digest authentication.
+    *   Add support for RTSP basic and digest authentication
+        ([#8941](https://github.com/google/ExoPlayer/issues/8941)).
+    *   Enable using repeat mode and playlist with RTSP
+        ([#8994](https://github.com/google/ExoPlayer/issues/8994)).
+    *   Add `RtspMediaSource.Factory` option to set the RTSP user agent.
+    *   Add `RtspMediaSource.Factory` option to force using TCP for streaming.
 *   GL demo app:
     *   Fix texture transformation to avoid green bars shown on some videos
         ([#8992](https://github.com/google/ExoPlayer/issues/8992)).
-    *   Add `RtspMediaSource.Factory` option to force using TCP for streaming.
 
 ### 2.14.0 (2021-05-13)
 
diff --git a/constants.gradle b/constants.gradle
index e3acfd0dc7..01b6746051 100644
--- a/constants.gradle
+++ b/constants.gradle
@@ -13,8 +13,8 @@
 // limitations under the License.
 project.ext {
     // ExoPlayer version and version code.
-    releaseVersion = '2.14.0'
-    releaseVersionCode = 2014000
+    releaseVersion = '2.14.1'
+    releaseVersionCode = 2014001
     minSdkVersion = 16
     appTargetSdkVersion = 29
     targetSdkVersion = 28 // TODO: Bump once b/143232359 is resolved. Also fix TODOs in UtilTest.
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java b/library/common/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java
index 217b564820..02492d3413 100644
--- a/library/common/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java
+++ b/library/common/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java
@@ -28,11 +28,11 @@ public final class ExoPlayerLibraryInfo {
 
   /** The version of the library expressed as a string, for example "1.2.3". */
   // Intentionally hardcoded. Do not derive from other constants (e.g. VERSION_INT) or vice versa.
-  public static final String VERSION = "2.14.0";
+  public static final String VERSION = "2.14.1";
 
   /** The version of the library expressed as {@code "ExoPlayerLib/" + VERSION}. */
   // Intentionally hardcoded. Do not derive from other constants (e.g. VERSION) or vice versa.
-  public static final String VERSION_SLASHY = "ExoPlayerLib/2.14.0";
+  public static final String VERSION_SLASHY = "ExoPlayerLib/2.14.1";
 
   /**
    * The version of the library expressed as an integer, for example 1002003.
@@ -42,7 +42,7 @@ public final class ExoPlayerLibraryInfo {
    * integer version 123045006 (123-045-006).
    */
   // Intentionally hardcoded. Do not derive from other constants (e.g. VERSION) or vice versa.
-  public static final int VERSION_INT = 2014000;
+  public static final int VERSION_INT = 2014001;
 
   /**
    * The default user agent for requests made by the library.