From 242bdffc80a263f28776fab116e90f35c62dc3e3 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 27 Jul 2016 07:46:46 -0700
Subject: [PATCH] Fix a few warnings.

- Suppress spurious resource type warnings.
- Make AS happy by making private method non-final.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=128584391
---
 .../exoplayer2/ext/okhttp/OkHttpDataSource.java    | 14 +++++---------
 .../android/exoplayer2/ui/SubtitlePainter.java     |  1 +
 .../exoplayer2/playbacktests/gts/DashTest.java     |  3 ++-
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/extensions/okhttp/src/main/java/com/google/android/exoplayer2/ext/okhttp/OkHttpDataSource.java b/extensions/okhttp/src/main/java/com/google/android/exoplayer2/ext/okhttp/OkHttpDataSource.java
index 9bb4edfa58..37b65598d2 100644
--- a/extensions/okhttp/src/main/java/com/google/android/exoplayer2/ext/okhttp/OkHttpDataSource.java
+++ b/extensions/okhttp/src/main/java/com/google/android/exoplayer2/ext/okhttp/OkHttpDataSource.java
@@ -70,9 +70,7 @@ public class OkHttpDataSource implements HttpDataSource {
    * @param client An {@link OkHttpClient} for use by the source.
    * @param userAgent The User-Agent string that should be used.
    * @param contentTypePredicate An optional {@link Predicate}. If a content type is rejected by the
-   *     predicate then a
-   *     {@link com.google.android.exoplayer2.upstream.HttpDataSource.InvalidContentTypeException} is
-   *     thrown from {@link #open(DataSpec)}.
+   *     predicate then a InvalidContentTypeException} is thrown from {@link #open(DataSpec)}.
    */
   public OkHttpDataSource(OkHttpClient client, String userAgent,
       Predicate<String> contentTypePredicate) {
@@ -83,9 +81,8 @@ public class OkHttpDataSource implements HttpDataSource {
    * @param client An {@link OkHttpClient} for use by the source.
    * @param userAgent The User-Agent string that should be used.
    * @param contentTypePredicate An optional {@link Predicate}. If a content type is rejected by the
-   *     predicate then a
-   *     {@link com.google.android.exoplayer2.upstream.HttpDataSource.InvalidContentTypeException} is
-   *     thrown from {@link #open(DataSpec)}.
+   *     predicate then a {@link InvalidContentTypeException} is thrown from
+   *     {@link #open(DataSpec)}.
    * @param listener An optional listener.
    */
   public OkHttpDataSource(OkHttpClient client, String userAgent,
@@ -97,9 +94,8 @@ public class OkHttpDataSource implements HttpDataSource {
    * @param client An {@link OkHttpClient} for use by the source.
    * @param userAgent The User-Agent string that should be used.
    * @param contentTypePredicate An optional {@link Predicate}. If a content type is rejected by the
-   *     predicate then a
-   *     {@link com.google.android.exoplayer2.upstream.HttpDataSource.InvalidContentTypeException} is
-   *     thrown from {@link #open(DataSpec)}.
+   *     predicate then a {@link InvalidContentTypeException} is thrown from
+   *     {@link #open(DataSpec)}.
    * @param listener An optional listener.
    * @param cacheControl An optional {@link CacheControl} which sets all requests' Cache-Control
    *     header. For example, you could force the network response for all requests.
diff --git a/library/src/main/java/com/google/android/exoplayer2/ui/SubtitlePainter.java b/library/src/main/java/com/google/android/exoplayer2/ui/SubtitlePainter.java
index 990ec7b5d9..4ebfc11237 100644
--- a/library/src/main/java/com/google/android/exoplayer2/ui/SubtitlePainter.java
+++ b/library/src/main/java/com/google/android/exoplayer2/ui/SubtitlePainter.java
@@ -91,6 +91,7 @@ import android.util.Log;
   private int textTop;
   private int textPaddingX;
 
+  @SuppressWarnings("ResourceType")
   public SubtitlePainter(Context context) {
     int[] viewAttr = {android.R.attr.lineSpacingExtra, android.R.attr.lineSpacingMultiplier};
     TypedArray styledAttributes = context.obtainStyledAttributes(null, viewAttr, 0, 0);
diff --git a/playbacktests/src/main/java/com/google/android/exoplayer2/playbacktests/gts/DashTest.java b/playbacktests/src/main/java/com/google/android/exoplayer2/playbacktests/gts/DashTest.java
index 63bcde61cc..c5fce769fc 100644
--- a/playbacktests/src/main/java/com/google/android/exoplayer2/playbacktests/gts/DashTest.java
+++ b/playbacktests/src/main/java/com/google/android/exoplayer2/playbacktests/gts/DashTest.java
@@ -695,6 +695,7 @@ public final class DashTest extends ActivityInstrumentationTestCase2<HostActivit
 
     @Override
     @TargetApi(18)
+    @SuppressWarnings("ResourceType")
     protected final StreamingDrmSessionManager buildDrmSessionManager(final String userAgent) {
       StreamingDrmSessionManager drmSessionManager = null;
       if (isWidevineEncrypted) {
@@ -873,7 +874,7 @@ public final class DashTest extends ActivityInstrumentationTestCase2<HostActivit
       return trackIndicesArray;
     }
 
-    private static final boolean isFormatHandled(int formatSupport) {
+    private static boolean isFormatHandled(int formatSupport) {
       return (formatSupport & RendererCapabilities.FORMAT_SUPPORT_MASK)
           == RendererCapabilities.FORMAT_HANDLED;
     }