Fix download cancellation

Issue: #4403 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=201525284
google · Jun 25, 2018 · 680d3fd · 680d3fd
1 parent b7d1496
commit 680d3fd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
@@ -16,6 +16,8 @@
   ([#3906](https://github.com/google/ExoPlayer/issues/3906)).
 * Fix crash downloading HLS media playlists
   ([#4396](https://github.com/google/ExoPlayer/issues/4396)).
+* Fix a bug where download cancellation was ignored
+  ([#4403](https://github.com/google/ExoPlayer/issues/4403)).
 * Set `METADATA_KEY_TITLE` on media descriptions
   ([#4292](https://github.com/google/ExoPlayer/issues/4292)).
 * Allow apps to register custom MIME types

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheUtil.java
@@ -129,11 +129,11 @@ public static void cache(
         cache,
         new CacheDataSource(cache, upstream),
         new byte[DEFAULT_BUFFER_SIZE_BYTES],
-        null,
-        0,
+        /* priorityTaskManager= */ null,
+        /* priority= */ 0,
         counters,
-        null,
-        false);
+        isCanceled,
+        /* enableEOFException= */ false);
   }
 
   /**