From db79f7989f928bb2f16dd153500663eb88813d06 Mon Sep 17 00:00:00 2001 From: olly Date: Thu, 26 May 2016 03:09:16 -0700 Subject: [PATCH] Fix a few warnings. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=123302488 --- .../java/com/google/android/exoplayer/SimpleExoPlayer.java | 4 +++- .../java/com/google/android/exoplayer/drm/DrmInitData.java | 1 + .../google/android/exoplayer/extractor/ogg/VorbisReader.java | 3 +-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/library/src/main/java/com/google/android/exoplayer/SimpleExoPlayer.java b/library/src/main/java/com/google/android/exoplayer/SimpleExoPlayer.java index 05ff27cba1..f9ab7f38a0 100644 --- a/library/src/main/java/com/google/android/exoplayer/SimpleExoPlayer.java +++ b/library/src/main/java/com/google/android/exoplayer/SimpleExoPlayer.java @@ -149,7 +149,7 @@ public final class SimpleExoPlayer implements ExoPlayer { /** * Returns the track type that the renderer at a given index handles. * - * @see {@link TrackRenderer#getTrackType()}. + * @see TrackRenderer#getTrackType() * @param index The index of the renderer. * @return One of the TRACK_TYPE_* constants defined in {@link C}. */ @@ -271,10 +271,12 @@ public final class SimpleExoPlayer implements ExoPlayer { // ExoPlayer implementation + @Override public void addListener(EventListener listener) { player.addListener(listener); } + @Override public void removeListener(EventListener listener) { player.removeListener(listener); } diff --git a/library/src/main/java/com/google/android/exoplayer/drm/DrmInitData.java b/library/src/main/java/com/google/android/exoplayer/drm/DrmInitData.java index 8a03b90b9c..f76795024a 100644 --- a/library/src/main/java/com/google/android/exoplayer/drm/DrmInitData.java +++ b/library/src/main/java/com/google/android/exoplayer/drm/DrmInitData.java @@ -222,6 +222,7 @@ public final class DrmInitData implements Comparator, Parcelable { dest.writeByteArray(data); } + @SuppressWarnings("hiding") public static final Parcelable.Creator CREATOR = new Parcelable.Creator() { diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/ogg/VorbisReader.java b/library/src/main/java/com/google/android/exoplayer/extractor/ogg/VorbisReader.java index 62d5a5ff04..dca9053bfa 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/ogg/VorbisReader.java +++ b/library/src/main/java/com/google/android/exoplayer/extractor/ogg/VorbisReader.java @@ -97,8 +97,7 @@ import java.util.ArrayList; } //@VisibleForTesting - /* package */ VorbisSetup readSetupHeaders(ParsableByteArray scratch) - throws IOException, InterruptedException { + /* package */ VorbisSetup readSetupHeaders(ParsableByteArray scratch) throws IOException { if (vorbisIdHeader == null) { vorbisIdHeader = VorbisUtil.readVorbisIdentificationHeader(scratch);