From 3e75d2a689061a55f5d0ba35833c67ed8290c9b2 Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Mon, 27 Jan 2020 19:12:02 +0000
Subject: [PATCH] Fix demo app

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

diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java
index 6814e296db..c100c853e7 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java
@@ -435,7 +435,7 @@ public class PlayerActivity extends AppCompatActivity
         if (Util.maybeRequestReadExternalStoragePermission(
             /* activity= */ this, subtitleInfo.uri)) {
           // The player will be reinitialized if the permission is granted.
-          return Collections.emptyList();
+          return null;
         }
         Format subtitleFormat =
             Format.createTextSampleFormat(