From 8e7ae9201a3188591e38bda4286301465f6ce6ea Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Tue, 19 Feb 2019 12:32:54 +0000
Subject: [PATCH] Bump version for 2.9.6 release

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

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 967b039757..5eead25cfb 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -8,9 +8,6 @@
     ([#5441](https://github.com/google/ExoPlayer/issues/5441)).
   * Prevent unnecessary reloads of the initialization segment for reused
     extractors.
-* DASH:
-  * Fix issue handling large `EventStream` presentation timestamps
-    ([#5490](https://github.com/google/ExoPlayer/issues/5490)).
 * `ExtractorMediaSource` renamed to `ProgressiveMediaSource`.
 * Support for playing spherical videos on Daydream.
 * Improve decoder re-use between playbacks. TODO: Write and link a blog post
@@ -51,19 +48,6 @@
   ([#3735](https://github.com/google/ExoPlayer/issues/3735)).
 * CEA-608: Improved conformance to the specification
   ([#3860](https://github.com/google/ExoPlayer/issues/3860)).
-* IMA extension:
-  * Require setting the `Player` on `AdsLoader` instances before
-    playback.
-  * Remove deprecated `ImaAdsMediaSource`. Create `AdsMediaSource` with an
-    `ImaAdsLoader` instead.
-  * Remove deprecated `AdsMediaSource` constructors. Listen for media source
-    events using `AdsMediaSource.addEventListener`, and ad interaction events by
-    adding a listener when building `ImaAdsLoader`.
-  * Allow apps to register playback-related obstructing views that are on top of
-    their ad display containers via `AdsLoader.AdViewProvider`. `PlayerView`
-    implements this interface and will register its control view. This makes it
-    possible for ad loading SDKs to calculate ad viewability accurately.
-* Remove `player` and `isTopLevelSource` parameters from `MediaSource.prepare`.
 * VP9 extension: Remove RGB output mode and libyuv dependency, and switch to
   surface YUV output as the default. Remove constructor parameters `scaleToFit`
   and `useSurfaceYuvOutput`.
@@ -78,6 +62,24 @@
 * MediaSessionConnector: Let apps intercept media button events
   ([#5179](https://github.com/google/ExoPlayer/issues/5179)).
 
+### 2.9.6 ###
+
+* Remove `player` and `isTopLevelSource` parameters from `MediaSource.prepare`.
+* IMA extension:
+  * Require setting the `Player` on `AdsLoader` instances before
+    playback.
+  * Remove deprecated `ImaAdsMediaSource`. Create `AdsMediaSource` with an
+    `ImaAdsLoader` instead.
+  * Remove deprecated `AdsMediaSource` constructors. Listen for media source
+    events using `AdsMediaSource.addEventListener`, and ad interaction events by
+    adding a listener when building `ImaAdsLoader`.
+  * Allow apps to register playback-related obstructing views that are on top of
+    their ad display containers via `AdsLoader.AdViewProvider`. `PlayerView`
+    implements this interface and will register its control view. This makes it
+    possible for ad loading SDKs to calculate ad viewability accurately.
+* DASH: Fix issue handling large `EventStream` presentation timestamps
+  ([#5490](https://github.com/google/ExoPlayer/issues/5490)).
+
 ### 2.9.5 ###
 
 * HLS: Parse `CHANNELS` attribute from `EXT-X-MEDIA` tag.
diff --git a/constants.gradle b/constants.gradle
index 1e1bfd593f..3f69ab6754 100644
--- a/constants.gradle
+++ b/constants.gradle
@@ -13,8 +13,8 @@
 // limitations under the License.
 project.ext {
     // ExoPlayer version and version code.
-    releaseVersion = '2.9.5'
-    releaseVersionCode = 2009005
+    releaseVersion = '2.9.6'
+    releaseVersionCode = 2009006
     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 e3a2e1cd27..b389ec742f 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.9.5";
+  public static final String VERSION = "2.9.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.9.5";
+  public static final String VERSION_SLASHY = "ExoPlayerLib/2.9.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 = 2009005;
+  public static final int VERSION_INT = 2009006;
 
   /**
    * Whether the library was compiled with {@link com.google.android.exoplayer2.util.Assertions}