From 87003b30fce2860dc734025b00fcf06de8da4ded Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 5 Nov 2019 18:34:29 +0000
Subject: [PATCH] Bump version to 2.10.7

PiperOrigin-RevId: 278658259
---
 RELEASENOTES.md                               | 20 +++++++++++--------
 constants.gradle                              |  4 ++--
 .../exoplayer2/ExoPlayerLibraryInfo.java      |  6 +++---
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 3cbb45c028..5d1d054fed 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -2,8 +2,6 @@
 
 ### dev-v2 (not yet released) ###
 
-* MediaSession extension: Update shuffle and repeat modes when playback state
-  is invalidated ([#6582](https://github.com/google/ExoPlayer/issues/6582)).
 * AV1 extension: Uses libgav1 to decode AV1 videos. Android 10 includes an AV1
   decoder, but the older versions of Android require this extension for playback
   of AV1 streams ([#3353](https://github.com/google/ExoPlayer/issues/3353)).
@@ -97,16 +95,10 @@
   fragment) ([#6470](https://github.com/google/ExoPlayer/issues/6470)).
 * Add `MediaPeriod.isLoading` to improve `Player.isLoading` state.
 * Make show and hide player controls accessible for TalkBack in `PlayerView`.
-* Add workaround to avoid truncating MP3 live streams with ICY metadata and
-  introductions that have a seeking header
-  ([#6537](https://github.com/google/ExoPlayer/issues/6537),
-  [#6315](https://github.com/google/ExoPlayer/issues/6315) and
-  [#5658](https://github.com/google/ExoPlayer/issues/5658)).
 * Pass the codec output `MediaFormat` to `VideoFrameMetadataListener`.
 * Deprecate the GVR extension.
 * Fix the start of audio getting truncated when transitioning to a new
   item in a playlist of opus streams.
-* Fix detection of Dolby Atmos in HLS to match the HLS authoring specification.
 * Fix FLAC extension build
   ([#6601](https://github.com/google/ExoPlayer/issues/6601).
 * Update the ffmpeg, flac and opus extension build instructions to use NDK r20.
@@ -116,6 +108,14 @@
 * Add support for subtitle files to the demo app
   ([#5523](https://github.com/google/ExoPlayer/issues/5523)).
 
+### 2.10.7 (2019-11-12) ###
+
+* HLS: Fix detection of Dolby Atmos to match the HLS authoring specification.
+* MediaSession extension: Update shuffle and repeat modes when playback state
+  is invalidated ([#6582](https://github.com/google/ExoPlayer/issues/6582)).
+* Fix the start of audio getting truncated when transitioning to a new
+  item in a playlist of opus streams.
+
 ### 2.10.6 (2019-10-17) ###
 
 * Add `Player.onPlaybackSuppressionReasonChanged` to allow listeners to
@@ -128,6 +128,10 @@
     ([#6523](https://github.com/google/ExoPlayer/issues/6523)).
 * HLS: Add support for ID3 in EMSG when using FMP4 streams
   ([spec](https://aomediacodec.github.io/av1-id3/)).
+* MP3: Add workaround to avoid prematurely ending playback of some SHOUTcast
+  live streams ([#6537](https://github.com/google/ExoPlayer/issues/6537),
+  [#6315](https://github.com/google/ExoPlayer/issues/6315) and
+  [#5658](https://github.com/google/ExoPlayer/issues/5658)).
 * Metadata: Expose the raw ICY metadata through `IcyInfo`
   ([#6476](https://github.com/google/ExoPlayer/issues/6476)).
 * UI:
diff --git a/constants.gradle b/constants.gradle
index ad37d86cb2..e957bf3f6a 100644
--- a/constants.gradle
+++ b/constants.gradle
@@ -13,8 +13,8 @@
 // limitations under the License.
 project.ext {
     // ExoPlayer version and version code.
-    releaseVersion = '2.10.6'
-    releaseVersionCode = 2010006
+    releaseVersion = '2.10.7'
+    releaseVersionCode = 2010007
     minSdkVersion = 16
     targetSdkVersion = 28
     compileSdkVersion = 29
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java
index adc05eb204..79d395a858 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java
@@ -29,11 +29,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.10.6";
+  public static final String VERSION = "2.10.7";
 
   /** 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.10.6";
+  public static final String VERSION_SLASHY = "ExoPlayerLib/2.10.7";
 
   /**
    * The version of the library expressed as an integer, for example 1002003.
@@ -43,7 +43,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 = 2010006;
+  public static final int VERSION_INT = 2010007;
 
   /**
    * Whether the library was compiled with {@link com.google.android.exoplayer2.util.Assertions}