From cadce0ef3f539a36dd8257189301538c050c5964 Mon Sep 17 00:00:00 2001 From: adrianv Date: Wed, 15 Mar 2017 20:23:51 -0700 Subject: [PATCH] Add @Nullable annotation for an optional field in CacheDataSource's constructor. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=150278031 --- .../android/exoplayer2/upstream/cache/CacheDataSource.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/library/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSource.java b/library/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSource.java index dc8797362f..a2e4382e0c 100644 --- a/library/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSource.java +++ b/library/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSource.java @@ -17,6 +17,7 @@ package com.google.android.exoplayer2.upstream.cache; import android.net.Uri; import android.support.annotation.IntDef; +import android.support.annotation.Nullable; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.upstream.DataSink; import com.google.android.exoplayer2.upstream.DataSource; @@ -89,7 +90,7 @@ public final class CacheDataSource implements DataSource { private final DataSource cacheReadDataSource; private final DataSource cacheWriteDataSource; private final DataSource upstreamDataSource; - private final EventListener eventListener; + @Nullable private final EventListener eventListener; private final boolean blockOnCache; private final boolean ignoreCacheOnError; @@ -149,7 +150,7 @@ public final class CacheDataSource implements DataSource { * @param eventListener An optional {@link EventListener} to receive events. */ public CacheDataSource(Cache cache, DataSource upstream, DataSource cacheReadDataSource, - DataSink cacheWriteDataSink, @Flags int flags, EventListener eventListener) { + DataSink cacheWriteDataSink, @Flags int flags, @Nullable EventListener eventListener) { this.cache = cache; this.cacheReadDataSource = cacheReadDataSource; this.blockOnCache = (flags & FLAG_BLOCK_ON_CACHE) != 0;