Misc cleanup.

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

library/src/androidTest/java/com/google/android/exoplayer/extractor/ogg/OpusReaderTest.java

@@ -42,7 +42,6 @@ public final class OpusReaderTest extends InstrumentationTestCase {
   private static final String TEST_FILE = "asset:///ogg/bear.opus";
 
   private OggExtractor extractor;
-  private OpusReader opusReader;
   private FakeExtractorOutput extractorOutput;
   private DefaultExtractorInput extractorInput;
 
@@ -61,8 +60,6 @@ public final class OpusReaderTest extends InstrumentationTestCase {
     assertTrue(extractor.sniff(extractorInput));
     extractorInput.resetPeekPosition();
 
-    opusReader = (OpusReader) extractor.getStreamReader();
-
     extractorOutput = new FakeExtractorOutput();
     extractor.init(extractorOutput);
   }

library/src/androidTest/java/com/google/android/exoplayer/extractor/ogg/TestData.java

@@ -34,7 +34,7 @@ import com.google.android.exoplayer.testutil.TestUtil;
         0x4F, 0x67, 0x67, 0x53, // Oggs.
         0x00, // Stream revision.
         headerType,
-        (int) (granule >> 0) & 0xFF,
+        (int) (granule) & 0xFF,
         (int) (granule >> 8) & 0xFF,
         (int) (granule >> 16) & 0xFF,
         (int) (granule >> 24) & 0xFF,
@@ -46,7 +46,7 @@ import com.google.android.exoplayer.testutil.TestUtil;
         0x10,
         0x00,
         0x00, // MSB of data serial number.
-        (pageSequenceCounter >> 0) & 0xFF,
+        (pageSequenceCounter) & 0xFF,
         (pageSequenceCounter >> 8) & 0xFF,
         (pageSequenceCounter >> 16) & 0xFF,
         (pageSequenceCounter >> 24) & 0xFF,

library/src/main/java/com/google/android/exoplayer/dash/mpd/MediaPresentationDescriptionParser.java

@@ -58,7 +58,7 @@ import java.util.regex.Pattern;
 public class MediaPresentationDescriptionParser extends DefaultHandler
     implements UriLoadable.Parser<MediaPresentationDescription> {
 
-  private static final String TAG = "MediaPresentationDescriptionParser";
+  private static final String TAG = "MpdParser";
 
   private static final Pattern FRAME_RATE_PATTERN = Pattern.compile("(\\d+)(?:/(\\d+))?");
 

library/src/main/java/com/google/android/exoplayer/extractor/mp4/FragmentedMp4Extractor.java

@@ -324,7 +324,7 @@ public final class FragmentedMp4Extractor implements Extractor {
       LeafAtom child = moovLeafChildren.get(i);
       if (child.type == Atom.TYPE_pssh) {
         if (schemeDatas == null) {
-          schemeDatas = new ArrayList<SchemeData>();
+          schemeDatas = new ArrayList<>();
         }
         byte[] psshData = child.data.data;
         UUID uuid = PsshAtomUtil.parseUuid(psshData);

library/src/main/java/com/google/android/exoplayer/extractor/ogg/OggExtractor.java

@@ -54,10 +54,8 @@ public class OggExtractor implements Extractor {
       }
       return true;
     } catch (ParserException e) {
-      // does not happen
+      return false;
-    } finally {
     }
-    return false;
   }
 
   @Override

library/src/main/java/com/google/android/exoplayer/text/SubtitleParser.java

@@ -31,6 +31,6 @@ public interface SubtitleParser extends
    *
    * @param positionUs The current playback position in microseconds.
    */
-  public void setPositionUs(long positionUs);
+  void setPositionUs(long positionUs);
 
 }

library/src/main/java/com/google/android/exoplayer/text/eia608/Eia608Subtitle.java

@@ -50,7 +50,7 @@ public final class Eia608Subtitle implements Subtitle {
   @Override
   public List<Cue> getCues(long timeUs) {
     if (caption == null || caption.isEmpty()) {
-      return Collections.<Cue>emptyList();
+      return Collections.emptyList();
     } else {
       return Collections.singletonList(new Cue(caption));
     }