loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-04-30 06:46:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix a few warnings.

Browse Source 
- 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
This commit is contained in:
olly 2016-07-27 07:46:46 -07:00 committed by Oliver Woodman
parent ac59bde2be
commit 242bdffc80
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
extensions/okhttp/src/main/java/com/google/android/exoplayer2/ext/okhttp/OkHttpDataSource.java
View File

@ -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.

1
library/src/main/java/com/google/android/exoplayer2/ui/SubtitlePainter.java
View File

@ -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);

3
playbacktests/src/main/java/com/google/android/exoplayer2/playbacktests/gts/DashTest.java
View File

@ -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;
}