Fix misc issues

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

RELEASENOTES.md

@@ -6,30 +6,30 @@
   rendering. You can read more about the GVR extension
   [here](https://medium.com/google-exoplayer/spatial-audio-with-exoplayer-and-gvr-cecb00e9da5f#.xdjebjd7g).
 * DASH improvements:
- * Support embedded CEA-608 closed captions
-   ([#2362](https://github.com/google/ExoPlayer/issues/2362)).
- * Support embedded EMSG events
-   ([#2176](https://github.com/google/ExoPlayer/issues/2176)).
- * Support mspr:pro manifest element
-   ([#2386](https://github.com/google/ExoPlayer/issues/2386)).
- * Correct handling of empty segment indices at the start of live events
-   ([#1865](https://github.com/google/ExoPlayer/issues/1865)).
+  * Support embedded CEA-608 closed captions
+    ([#2362](https://github.com/google/ExoPlayer/issues/2362)).
+  * Support embedded EMSG events
+    ([#2176](https://github.com/google/ExoPlayer/issues/2176)).
+  * Support mspr:pro manifest element
+    ([#2386](https://github.com/google/ExoPlayer/issues/2386)).
+  * Correct handling of empty segment indices at the start of live events
+    ([#1865](https://github.com/google/ExoPlayer/issues/1865)).
 * HLS improvements:
- * Respect initial track selection
-   ([#2353](https://github.com/google/ExoPlayer/issues/2353)).
- * Reduced frequency of media playlist requests when playback position is close
-   to the live edge ([#2548](https://github.com/google/ExoPlayer/issues/2548)).
- * Exposed the master playlist through ExoPlayer.getCurrentManifest()
-   ([#2537](https://github.com/google/ExoPlayer/issues/2537)).
- * Support CLOSED-CAPTIONS #EXT-X-MEDIA type
-   ([#341](https://github.com/google/ExoPlayer/issues/341)).
- * Fixed handling of negative values in #EXT-X-SUPPORT
-   ([#2495](https://github.com/google/ExoPlayer/issues/2495)).
- * Fixed potential endless buffering state for streams with WebVTT subtitles
-   ([#2424](https://github.com/google/ExoPlayer/issues/2424)).
+  * Respect initial track selection
+    ([#2353](https://github.com/google/ExoPlayer/issues/2353)).
+  * Reduced frequency of media playlist requests when playback position is close
+    to the live edge ([#2548](https://github.com/google/ExoPlayer/issues/2548)).
+  * Exposed the master playlist through ExoPlayer.getCurrentManifest()
+    ([#2537](https://github.com/google/ExoPlayer/issues/2537)).
+  * Support CLOSED-CAPTIONS #EXT-X-MEDIA type
+    ([#341](https://github.com/google/ExoPlayer/issues/341)).
+  * Fixed handling of negative values in #EXT-X-SUPPORT
+    ([#2495](https://github.com/google/ExoPlayer/issues/2495)).
+  * Fixed potential endless buffering state for streams with WebVTT subtitles
+    ([#2424](https://github.com/google/ExoPlayer/issues/2424)).
 * MPEG-TS improvements:
- * Support for multiple programs.
- * Support for multiple closed captions and caption service descriptors
+  * Support for multiple programs.
+  * Support for multiple closed captions and caption service descriptors
    ([#2161](https://github.com/google/ExoPlayer/issues/2161)).
 * MP3: Add `FLAG_ENABLE_CONSTANT_BITRATE_SEEKING` extractor option to enable
   constant bitrate seeking in MP3 files that would otherwise be unseekable
@@ -125,15 +125,15 @@
 * HLS: Support for seeking in live streams
   ([#87](https://github.com/google/ExoPlayer/issues/87)).
 * HLS: Improved support:
- * Support for EXT-X-PROGRAM-DATE-TIME
-   ([#747](https://github.com/google/ExoPlayer/issues/747)).
- * Improved handling of sample timestamps and their alignment across variants
-   and renditions.
- * Fix issue that could cause playbacks to get stuck in an endless initial
-   buffering state.
- * Correctly propagate BehindLiveWindowException instead of
-   IndexOutOfBoundsException exception
-   ([#1695](https://github.com/google/ExoPlayer/issues/1695)).
+  * Support for EXT-X-PROGRAM-DATE-TIME
+    ([#747](https://github.com/google/ExoPlayer/issues/747)).
+  * Improved handling of sample timestamps and their alignment across variants
+    and renditions.
+  * Fix issue that could cause playbacks to get stuck in an endless initial
+    buffering state.
+  * Correctly propagate BehindLiveWindowException instead of
+    IndexOutOfBoundsException exception
+    ([#1695](https://github.com/google/ExoPlayer/issues/1695)).
 * MP3/MP4: Support for ID3 metadata, including embedded album art
   ([#979](https://github.com/google/ExoPlayer/issues/979)).
 * Improved customization of UI components. You can read about customization of
@@ -143,19 +143,19 @@
   MediaPeriod transitions.
 * EIA608: Support for caption styling and positioning.
 * MPEG-TS: Improved support:
- * Support injection of custom TS payload readers.
- * Support injection of custom section payload readers.
- * Support SCTE-35 splice information messages.
- * Support multiple table sections in a single PSI section.
- * Fix NullPointerException when an unsupported stream type is encountered
-   ([#2149](https://github.com/google/ExoPlayer/issues/2149)).
- * Avoid failure when expected ID3 header not found
-   ([#1966](https://github.com/google/ExoPlayer/issues/1966)).
+  * Support injection of custom TS payload readers.
+  * Support injection of custom section payload readers.
+  * Support SCTE-35 splice information messages.
+  * Support multiple table sections in a single PSI section.
+  * Fix NullPointerException when an unsupported stream type is encountered
+    ([#2149](https://github.com/google/ExoPlayer/issues/2149)).
+  * Avoid failure when expected ID3 header not found
+    ([#1966](https://github.com/google/ExoPlayer/issues/1966)).
 * Improvements to the upstream cache package.
- * Support caching of media segments for DASH, HLS and SmoothStreaming. Note
-   that caching of manifest and playlist files is still not supported in the
-   (normal) case where the corresponding responses are compressed.
- * Support caching for ExtractorMediaSource based playbacks.
+  * Support caching of media segments for DASH, HLS and SmoothStreaming. Note
+    that caching of manifest and playlist files is still not supported in the
+    (normal) case where the corresponding responses are compressed.
+  * Support caching for ExtractorMediaSource based playbacks.
 * Improved flexibility of SimpleExoPlayer
   ([#2102](https://github.com/google/ExoPlayer/issues/2102)).
 * Fix issue where only the audio of a video would play due to capability
@@ -227,62 +227,62 @@ some of the motivations behind ExoPlayer 2.x
   structure and class names have also been sanitized. Read more
   [here](https://medium.com/google-exoplayer/exoplayer-2-x-new-package-and-class-names-ef8e1d9ba96f#.lv8sd4nez).
 * Key architectural changes:
- * Late binding between rendering and media source components. Allows the same
-   rendering components to be re-used from one playback to another. Enables
-   features such as gapless playback through playlists and DASH multi-period
-   support.
- * Improved track selection design. More details can be found
-   [here](https://medium.com/google-exoplayer/exoplayer-2-x-track-selection-2b62ff712cc9#.n00zo76b6).
- * LoadControl now used to control buffering and loading across all playback
-   types.
- * Media source components given additional structure. A new MediaSource class
-   has been introduced. MediaSources expose Timelines that describe the media
-   they expose, and can consist of multiple MediaPeriods. This enables features
-   such as seeking in live playbacks and DASH multi-period support.
- * Responsibility for loading the initial DASH/SmoothStreaming/HLS manifest is
-   promoted to the corresponding MediaSource components and is no longer the
-   application's responsibility.
- * Higher level abstractions such as SimpleExoPlayer have been added to the
-   library. These make the library easier to use for common use cases. The demo
-   app is halved in size as a result, whilst at the same time gaining more
-   functionality. Read more
-   [here](https://medium.com/google-exoplayer/exoplayer-2-x-improved-demo-app-d97171aaaaa1).
- * Enhanced library support for implementing audio extensions. Read more
-   [here](https://medium.com/google-exoplayer/exoplayer-2-x-new-audio-features-cfb26c2883a#.ua75vu4s3).
- * Format and MediaFormat are replaced by a single Format class.
+  * Late binding between rendering and media source components. Allows the same
+    rendering components to be re-used from one playback to another. Enables
+    features such as gapless playback through playlists and DASH multi-period
+    support.
+  * Improved track selection design. More details can be found
+    [here](https://medium.com/google-exoplayer/exoplayer-2-x-track-selection-2b62ff712cc9#.n00zo76b6).
+  * LoadControl now used to control buffering and loading across all playback
+    types.
+  * Media source components given additional structure. A new MediaSource class
+    has been introduced. MediaSources expose Timelines that describe the media
+    they expose, and can consist of multiple MediaPeriods. This enables features
+    such as seeking in live playbacks and DASH multi-period support.
+  * Responsibility for loading the initial DASH/SmoothStreaming/HLS manifest is
+    promoted to the corresponding MediaSource components and is no longer the
+    application's responsibility.
+  * Higher level abstractions such as SimpleExoPlayer have been added to the
+    library. These make the library easier to use for common use cases. The demo
+    app is halved in size as a result, whilst at the same time gaining more
+    functionality. Read more
+    [here](https://medium.com/google-exoplayer/exoplayer-2-x-improved-demo-app-d97171aaaaa1).
+  * Enhanced library support for implementing audio extensions. Read more
+    [here](https://medium.com/google-exoplayer/exoplayer-2-x-new-audio-features-cfb26c2883a#.ua75vu4s3).
+  * Format and MediaFormat are replaced by a single Format class.
 * Key new features:
- * Playlist support. Includes support for gapless playback between playlist
-   items and consistent application of LoadControl and TrackSelector policies
-   when transitioning between items
-   ([#1270](https://github.com/google/ExoPlayer/issues/1270)).
- * Seeking in live playbacks for DASH and SmoothStreaming
-   ([#291](https://github.com/google/ExoPlayer/issues/291)).
- * DASH multi-period support
-   ([#557](https://github.com/google/ExoPlayer/issues/557)).
- * MediaSource composition allows MediaSources to be concatenated into a
-   playlist, merged and looped. Read more
-   [here](https://medium.com/google-exoplayer/exoplayer-2-x-mediasource-composition-6c285fcbca1f#.zfha8qupz).
- * Looping support (see above)
-   ([#490](https://github.com/google/ExoPlayer/issues/490)).
- * Ability to query information about all tracks in a piece of media (including
-   those not supported by the device)
-  ([#1121](https://github.com/google/ExoPlayer/issues/1121)).
- * Improved player controls.
- * Support for PSSH in fMP4 moof atoms
-   ([#1143](https://github.com/google/ExoPlayer/issues/1143)).
- * Support for Opus in Ogg
-   ([#1447](https://github.com/google/ExoPlayer/issues/1447)).
- * CacheDataSource support for standalone media file playbacks (mp3, mp4 etc).
- * FFMPEG extension (for audio only).
+  * Playlist support. Includes support for gapless playback between playlist
+    items and consistent application of LoadControl and TrackSelector policies
+    when transitioning between items
+    ([#1270](https://github.com/google/ExoPlayer/issues/1270)).
+  * Seeking in live playbacks for DASH and SmoothStreaming
+    ([#291](https://github.com/google/ExoPlayer/issues/291)).
+  * DASH multi-period support
+    ([#557](https://github.com/google/ExoPlayer/issues/557)).
+  * MediaSource composition allows MediaSources to be concatenated into a
+    playlist, merged and looped. Read more
+    [here](https://medium.com/google-exoplayer/exoplayer-2-x-mediasource-composition-6c285fcbca1f#.zfha8qupz).
+  * Looping support (see above)
+    ([#490](https://github.com/google/ExoPlayer/issues/490)).
+  * Ability to query information about all tracks in a piece of media (including
+    those not supported by the device)
+    ([#1121](https://github.com/google/ExoPlayer/issues/1121)).
+  * Improved player controls.
+  * Support for PSSH in fMP4 moof atoms
+    ([#1143](https://github.com/google/ExoPlayer/issues/1143)).
+  * Support for Opus in Ogg
+    ([#1447](https://github.com/google/ExoPlayer/issues/1447)).
+  * CacheDataSource support for standalone media file playbacks (mp3, mp4 etc).
+  * FFMPEG extension (for audio only).
 * Key bug fixes:
- * Removed unnecessary secondary requests when playing standalone media files
-   ([#1041](https://github.com/google/ExoPlayer/issues/1041)).
- * Fixed playback of video only (i.e. no audio) live streams
-   ([#758](https://github.com/google/ExoPlayer/issues/758)).
- * Fixed silent failure when media buffer is too small
-   ([#583](https://github.com/google/ExoPlayer/issues/583)).
- * Suppressed "Sending message to a Handler on a dead thread" warnings
-   ([#426](https://github.com/google/ExoPlayer/issues/426)).
+  * Removed unnecessary secondary requests when playing standalone media files
+    ([#1041](https://github.com/google/ExoPlayer/issues/1041)).
+  * Fixed playback of video only (i.e. no audio) live streams
+    ([#758](https://github.com/google/ExoPlayer/issues/758)).
+  * Fixed silent failure when media buffer is too small
+    ([#583](https://github.com/google/ExoPlayer/issues/583)).
+  * Suppressed "Sending message to a Handler on a dead thread" warnings
+    ([#426](https://github.com/google/ExoPlayer/issues/426)).
 
 # Legacy release notes #
 

library/core/src/main/java/com/google/android/exoplayer2/source/dash/DefaultDashChunkSource.java

@@ -109,8 +109,7 @@ public class DefaultDashChunkSource implements DashChunkSource {
    *     data ranges are adjacent.
    * @param enableEventMessageTrack Whether the chunks generated by the source may output an event
    *     message track.
-   * @param enableEventMessageTrack Whether the chunks generated by the source may output a CEA-608
-   *     track.
+   * @param enableCea608Track Whether the chunks generated by the source may output a CEA-608 track.
    */
   public DefaultDashChunkSource(LoaderErrorThrower manifestLoaderErrorThrower,
       DashManifest manifest, int periodIndex, int adaptationSetIndex, TrackSelection trackSelection,