Add some missing Nullable annotations

Also remove NonNull, since we assume NonNull by default. Except
where explicitly overriding a method with NonNull annotated args,
in which case we're still expected to use it.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=209758204
This commit is contained in:
olly 2018-08-22 06:51:42 -07:00 committed by Oliver Woodman
parent e2ebb78b63
commit 9ccbb5bd6d
7 changed files with 8 additions and 9 deletions

View file

@ -490,7 +490,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
return codec;
}
protected final MediaCodecInfo getCodecInfo() {
protected final @Nullable MediaCodecInfo getCodecInfo() {
return codecInfo;
}

View file

@ -19,6 +19,7 @@ import android.content.Context;
import android.graphics.Point;
import android.os.Parcel;
import android.os.Parcelable;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.text.TextUtils;
import android.util.Pair;
@ -2032,7 +2033,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
* negative integer if this score is worse than the other.
*/
@Override
public int compareTo(AudioTrackScore other) {
public int compareTo(@NonNull AudioTrackScore other) {
if (this.withinRendererCapabilitiesScore != other.withinRendererCapabilitiesScore) {
return compareInts(this.withinRendererCapabilitiesScore,
other.withinRendererCapabilitiesScore);

View file

@ -379,7 +379,7 @@ public class DefaultHttpDataSource extends BaseDataSource implements HttpDataSou
*
* @return The current open connection, or null.
*/
protected final HttpURLConnection getConnection() {
protected final @Nullable HttpURLConnection getConnection() {
return connection;
}

View file

@ -15,7 +15,6 @@
*/
package com.google.android.exoplayer2.upstream.cache;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import java.io.File;
import java.io.IOException;
@ -96,7 +95,6 @@ public interface Cache {
* @param listener The listener to add.
* @return The current spans for the key.
*/
@NonNull
NavigableSet<CacheSpan> addListener(String key, Listener listener);
/**
@ -113,7 +111,6 @@ public interface Cache {
* @param key The key for which spans should be returned.
* @return The spans for the key.
*/
@NonNull
NavigableSet<CacheSpan> getCachedSpans(String key);
/**

View file

@ -17,6 +17,7 @@ package com.google.android.exoplayer2.upstream.cache;
import android.os.ConditionVariable;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.util.Log;
import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.util.Assertions;
@ -224,7 +225,7 @@ public final class SimpleCache implements Cache {
}
@Override
public synchronized SimpleCacheSpan startReadWriteNonBlocking(String key, long position)
public synchronized @Nullable SimpleCacheSpan startReadWriteNonBlocking(String key, long position)
throws CacheException {
Assertions.checkState(!released);
SimpleCacheSpan cacheSpan = getSpan(key, position);

View file

@ -155,7 +155,7 @@ public final class DefaultHlsPlaylistTracker
}
@Override
public HlsMasterPlaylist getMasterPlaylist() {
public @Nullable HlsMasterPlaylist getMasterPlaylist() {
return masterPlaylist;
}

View file

@ -597,7 +597,7 @@ public class PlayerView extends FrameLayout {
}
/** Returns the default artwork to display. */
public Drawable getDefaultArtwork() {
public @Nullable Drawable getDefaultArtwork() {
return defaultArtwork;
}