From aa9b85c66e90f44914b0bf637f7a81269daf021d Mon Sep 17 00:00:00 2001
From: Daniel Brain <me@danielbrain.com>
Date: Tue, 25 Feb 2020 15:51:58 +1100
Subject: [PATCH 1/2] DownloadService.onStartCommand() nullable Intent

---
 .../com/google/android/exoplayer2/offline/DownloadService.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
index c9c3275141..db80682361 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
@@ -595,7 +595,7 @@ public abstract class DownloadService extends Service {
   }
 
   @Override
-  public int onStartCommand(Intent intent, int flags, int startId) {
+  public int onStartCommand(@Nullable Intent intent, int flags, int startId) {
     lastStartId = startId;
     taskRemoved = false;
     @Nullable String intentAction = null;

From 39f097c79ca246c29e6eef538570c71c46fc51b1 Mon Sep 17 00:00:00 2001
From: Daniel Brain <me@danielbrain.com>
Date: Tue, 25 Feb 2020 15:53:03 +1100
Subject: [PATCH 2/2] DownloadHelper.createMediaSource() nullable
 DrmSessionManager

---
 .../com/google/android/exoplayer2/offline/DownloadHelper.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
index e77eb7d88e..4cb54c6551 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
@@ -459,7 +459,7 @@ public final class DownloadHelper {
   public static MediaSource createMediaSource(
       DownloadRequest downloadRequest,
       DataSource.Factory dataSourceFactory,
-      DrmSessionManager<?> drmSessionManager) {
+      @Nullable DrmSessionManager<?> drmSessionManager) {
     @Nullable Constructor<? extends MediaSourceFactory> constructor;
     switch (downloadRequest.type) {
       case DownloadRequest.TYPE_DASH: