Small cleanup

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=195504064

RELEASENOTES.md

@@ -2,10 +2,7 @@
 
 
 ### dev-v2 (not yet released) ###
 ### dev-v2 (not yet released) ###
 
 
-* Added dependency on checkerframework annotations for static code analysis.
-* IMA: Expose ad load errors via `MediaSourceEventListener` on `AdsMediaSource`,
-  and allow setting an ad event listener on `ImaAdsLoader`. Deprecate the
-  `AdsMediaSource.EventListener`.
+* Coming soon...
 
 
 ### 2.8.0 ###
 ### 2.8.0 ###
 
 
@@ -82,8 +79,12 @@
     ([#4164](https://github.com/google/ExoPlayer/issues/4182)).
     ([#4164](https://github.com/google/ExoPlayer/issues/4182)).
   * Fix seeking in live streams
   * Fix seeking in live streams
     ([#4187](https://github.com/google/ExoPlayer/issues/4187)).
     ([#4187](https://github.com/google/ExoPlayer/issues/4187)).
-* IMA: Allow setting the ad media load timeout
+* IMA:
+  * Allow setting the ad media load timeout
     ([#3691](https://github.com/google/ExoPlayer/issues/3691)).
     ([#3691](https://github.com/google/ExoPlayer/issues/3691)).
+  * Expose ad load errors via `MediaSourceEventListener` on `AdsMediaSource`,
+    and allow setting an ad event listener on `ImaAdsLoader`. Deprecate the
+    `AdsMediaSource.EventListener`.
 * Add `AnalyticsListener` interface which can be registered in
 * Add `AnalyticsListener` interface which can be registered in
   `SimpleExoPlayer` to receive detailed metadata for each ExoPlayer event.
   `SimpleExoPlayer` to receive detailed metadata for each ExoPlayer event.
 * Optimize seeking in FMP4 by enabling seeking to the nearest sync sample within
 * Optimize seeking in FMP4 by enabling seeking to the nearest sync sample within
@@ -101,6 +102,7 @@
 * Removed default renderer time offset of 60000000 from internal player. The
 * Removed default renderer time offset of 60000000 from internal player. The
   actual renderer timestamp offset can be obtained by listening to
   actual renderer timestamp offset can be obtained by listening to
   `BaseRenderer.onStreamChanged`.
   `BaseRenderer.onStreamChanged`.
+* Added dependencies on checkerframework annotations for static code analysis.
 
 
 ### 2.7.3 ###
 ### 2.7.3 ###
 
 

library/dash/build.gradle

@@ -35,7 +35,6 @@ android {
 dependencies {
 dependencies {
     implementation project(modulePrefix + 'library-core')
     implementation project(modulePrefix + 'library-core')
     implementation 'org.checkerframework:checker-qual:' + checkerframeworkVersion
     implementation 'org.checkerframework:checker-qual:' + checkerframeworkVersion
-    implementation 'org.checkerframework:checker-compat-qual:' + checkerframeworkVersion
     implementation 'com.android.support:support-annotations:' + supportLibraryVersion
     implementation 'com.android.support:support-annotations:' + supportLibraryVersion
     testImplementation project(modulePrefix + 'testutils-robolectric')
     testImplementation project(modulePrefix + 'testutils-robolectric')
 }
 }

library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifest.java

@@ -130,6 +130,7 @@ public class DashManifest implements FilterableManifest<DashManifest, Representa
    * @return A copy of this manifest with the selected representations.
    * @return A copy of this manifest with the selected representations.
    * @throws IndexOutOfBoundsException If a key has an invalid index.
    * @throws IndexOutOfBoundsException If a key has an invalid index.
    */
    */
+  @Override
   public final DashManifest copy(List<RepresentationKey> representationKeys) {
   public final DashManifest copy(List<RepresentationKey> representationKeys) {
     LinkedList<RepresentationKey> keys = new LinkedList<>(representationKeys);
     LinkedList<RepresentationKey> keys = new LinkedList<>(representationKeys);
     Collections.sort(keys);
     Collections.sort(keys);

library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylist.java

@@ -115,6 +115,7 @@ public final class HlsMasterPlaylist extends HlsPlaylist<HlsMasterPlaylist> {
    * @return A copy of this playlist which includes only the renditions identified by the given
    * @return A copy of this playlist which includes only the renditions identified by the given
    *     urls.
    *     urls.
    */
    */
+  @Override
   public HlsMasterPlaylist copy(List<RenditionKey> renditionKeys) {
   public HlsMasterPlaylist copy(List<RenditionKey> renditionKeys) {
     return new HlsMasterPlaylist(
     return new HlsMasterPlaylist(
         baseUri,
         baseUri,