From 0cda57aa5a2cf33d95682b65a29c31fd35d6051c Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 14 Oct 2019 10:26:39 +0100
Subject: [PATCH] Bump version to 2.10.6

PiperOrigin-RevId: 274534626
---
 RELEASENOTES.md                               | 27 +++++++++++++++++--
 constants.gradle                              |  4 +--
 .../exoplayer2/ExoPlayerLibraryInfo.java      |  6 ++---
 3 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index a5ea5c3d54..63c8010175 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -1,9 +1,32 @@
 # Release notes #
 
-### 2.10.6 ###
+### 2.10.6 (2019-10-17) ###
 
 * Add `Player.onPlaybackSuppressionReasonChanged` to allow listeners to
-  detect playbacks suppressions (e.g. audio focus loss) directly
+  detect playbacks suppressions (e.g. transient audio focus loss) directly
+  ([#6203](https://github.com/google/ExoPlayer/issues/6203)).
+* DASH:
+  * Support `Label` elements
+    ([#6297](https://github.com/google/ExoPlayer/issues/6297)).
+  * Support legacy audio channel configuration
+    ([#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/)).
+* Metadata: Expose the raw ICY metadata through `IcyInfo`
+  ([#6476](https://github.com/google/ExoPlayer/issues/6476)).
+* UI:
+  * Setting `app:played_color` on `PlayerView` and `PlayerControlView` no longer
+    adjusts the colors of the scrubber handle , buffered and unplayed parts of
+    the time bar. These can be set separately using `app:scrubber_color`,
+    `app:buffered_color` and `app_unplayed_color` respectively.
+  * Setting `app:ad_marker_color` on `PlayerView` and `PlayerControlView` no
+    longer adjusts the color of played ad markers. The color of played ad
+    markers can be set separately using `app:played_ad_marker_color`.
+
+### 2.10.6 (2019-10-17) ###
+
+* Add `Player.onPlaybackSuppressionReasonChanged` to allow listeners to
+  detect playbacks suppressions (e.g. transient audio focus loss) directly
   ([#6203](https://github.com/google/ExoPlayer/issues/6203)).
 * DASH:
   * Support `Label` elements
diff --git a/constants.gradle b/constants.gradle
index 5334adcb39..2a8d0c5776 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.5'
-    releaseVersionCode = 2010005
+    releaseVersion = '2.10.6'
+    releaseVersionCode = 2010006
     minSdkVersion = 16
     targetSdkVersion = 28
     compileSdkVersion = 28
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 bf64a14225..adc05eb204 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.5";
+  public static final String VERSION = "2.10.6";
 
   /** 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.5";
+  public static final String VERSION_SLASHY = "ExoPlayerLib/2.10.6";
 
   /**
    * 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 = 2010005;
+  public static final int VERSION_INT = 2010006;
 
   /**
    * Whether the library was compiled with {@link com.google.android.exoplayer2.util.Assertions}