Cancel and interrupt downloads

Upstream components may incorrectly clear the interrupted flag and not
propagate an exception when the caching thread is interrupted due to
cancellation. Pass a settable flag down to CacheUtil.cache and check it
frequently so it's not necessary to rely on the interrupted flag.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=195371244

library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java

@@ -704,7 +704,7 @@ public final class DownloadManager {
               }
               }
             });
             });
       } else if (changeStateAndNotify(STATE_STARTED, STATE_STARTED_CANCELING)) {
       } else if (changeStateAndNotify(STATE_STARTED, STATE_STARTED_CANCELING)) {
-        thread.interrupt();
+        cancelDownload();
       }
       }
     }
     }
 
 
@@ -733,7 +733,14 @@ public final class DownloadManager {
       return true;
       return true;
     }
     }
 
 
-    /* Methods running on download thread. */
+    private void cancelDownload() {
+      if (downloader != null) {
+        downloader.cancel();
+      }
+      thread.interrupt();
+    }
+
+    // Methods running on download thread.
 
 
     @Override
     @Override
     public void run() {
     public void run() {
@@ -746,7 +753,7 @@ public final class DownloadManager {
         } else {
         } else {
           int errorCount = 0;
           int errorCount = 0;
           long errorPosition = C.LENGTH_UNSET;
           long errorPosition = C.LENGTH_UNSET;
-          while (true) {
+          while (!Thread.interrupted()) {
             try {
             try {
               downloader.download();
               downloader.download();
               break;
               break;

library/core/src/main/java/com/google/android/exoplayer2/offline/Downloader.java

@@ -32,6 +32,9 @@ public interface Downloader {
    */
    */
   void download() throws InterruptedException, IOException;
   void download() throws InterruptedException, IOException;
 
 
+  /** Interrupts any current download operation and prevents future operations from running. */
+  void cancel();
+
   /** Returns the total number of downloaded bytes. */
   /** Returns the total number of downloaded bytes. */
   long getDownloadedBytes();
   long getDownloadedBytes();
 
 

library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloader.java

@@ -24,6 +24,7 @@ import com.google.android.exoplayer2.upstream.cache.CacheUtil;
 import com.google.android.exoplayer2.upstream.cache.CacheUtil.CachingCounters;
 import com.google.android.exoplayer2.upstream.cache.CacheUtil.CachingCounters;
 import com.google.android.exoplayer2.util.PriorityTaskManager;
 import com.google.android.exoplayer2.util.PriorityTaskManager;
 import java.io.IOException;
 import java.io.IOException;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 
 /**
 /**
  * A downloader for progressive media streams.
  * A downloader for progressive media streams.
@@ -37,6 +38,7 @@ public final class ProgressiveDownloader implements Downloader {
   private final CacheDataSource dataSource;
   private final CacheDataSource dataSource;
   private final PriorityTaskManager priorityTaskManager;
   private final PriorityTaskManager priorityTaskManager;
   private final CacheUtil.CachingCounters cachingCounters;
   private final CacheUtil.CachingCounters cachingCounters;
+  private final AtomicBoolean isCanceled;
 
 
   /**
   /**
    * @param uri Uri of the data to be downloaded.
    * @param uri Uri of the data to be downloaded.
@@ -51,6 +53,7 @@ public final class ProgressiveDownloader implements Downloader {
     this.dataSource = constructorHelper.buildCacheDataSource(false);
     this.dataSource = constructorHelper.buildCacheDataSource(false);
     this.priorityTaskManager = constructorHelper.getPriorityTaskManager();
     this.priorityTaskManager = constructorHelper.getPriorityTaskManager();
     cachingCounters = new CachingCounters();
     cachingCounters = new CachingCounters();
+    isCanceled = new AtomicBoolean();
   }
   }
 
 
   @Override
   @Override
@@ -65,6 +68,7 @@ public final class ProgressiveDownloader implements Downloader {
           priorityTaskManager,
           priorityTaskManager,
           C.PRIORITY_DOWNLOAD,
           C.PRIORITY_DOWNLOAD,
           cachingCounters,
           cachingCounters,
+          isCanceled,
           /* enableEOFException= */ true);
           /* enableEOFException= */ true);
     } finally {
     } finally {
       priorityTaskManager.remove(C.PRIORITY_DOWNLOAD);
       priorityTaskManager.remove(C.PRIORITY_DOWNLOAD);
@@ -72,6 +76,11 @@ public final class ProgressiveDownloader implements Downloader {
   }
   }
 
 
   @Override
   @Override
+  public void cancel() {
+    isCanceled.set(true);
+  }
+
+  @Override
   public long getDownloadedBytes() {
   public long getDownloadedBytes() {
     return cachingCounters.totalCachedBytes();
     return cachingCounters.totalCachedBytes();
   }
   }

library/core/src/main/java/com/google/android/exoplayer2/offline/SegmentDownloader.java

@@ -29,6 +29,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Collections;
 import java.util.List;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 
 /**
 /**
  * Base class for multi segment stream downloaders.
  * Base class for multi segment stream downloaders.
@@ -68,6 +69,7 @@ public abstract class SegmentDownloader<M extends FilterableManifest<M, K>, K>
   private final CacheDataSource dataSource;
   private final CacheDataSource dataSource;
   private final CacheDataSource offlineDataSource;
   private final CacheDataSource offlineDataSource;
   private final ArrayList<K> keys;
   private final ArrayList<K> keys;
+  private final AtomicBoolean isCanceled;
 
 
   private volatile int totalSegments;
   private volatile int totalSegments;
   private volatile int downloadedSegments;
   private volatile int downloadedSegments;
@@ -87,6 +89,7 @@ public abstract class SegmentDownloader<M extends FilterableManifest<M, K>, K>
     this.priorityTaskManager = constructorHelper.getPriorityTaskManager();
     this.priorityTaskManager = constructorHelper.getPriorityTaskManager();
     keys = new ArrayList<>(trackKeys);
     keys = new ArrayList<>(trackKeys);
     totalSegments = C.LENGTH_UNSET;
     totalSegments = C.LENGTH_UNSET;
+    isCanceled = new AtomicBoolean();
   }
   }
 
 
   /**
   /**
@@ -118,6 +121,7 @@ public abstract class SegmentDownloader<M extends FilterableManifest<M, K>, K>
               priorityTaskManager,
               priorityTaskManager,
               C.PRIORITY_DOWNLOAD,
               C.PRIORITY_DOWNLOAD,
               cachingCounters,
               cachingCounters,
+              isCanceled,
               true);
               true);
           downloadedSegments++;
           downloadedSegments++;
         } finally {
         } finally {
@@ -130,6 +134,11 @@ public abstract class SegmentDownloader<M extends FilterableManifest<M, K>, K>
   }
   }
 
 
   @Override
   @Override
+  public void cancel() {
+    isCanceled.set(true);
+  }
+
+  @Override
   public final long getDownloadedBytes() {
   public final long getDownloadedBytes() {
     return downloadedBytes;
     return downloadedBytes;
   }
   }

library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheUtil.java

@@ -26,6 +26,7 @@ import com.google.android.exoplayer2.util.Util;
 import java.io.EOFException;
 import java.io.EOFException;
 import java.io.IOException;
 import java.io.IOException;
 import java.util.NavigableSet;
 import java.util.NavigableSet;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 
 /**
 /**
  * Caching related utility methods.
  * Caching related utility methods.
@@ -112,14 +113,27 @@ public final class CacheUtil {
    * @param cache A {@link Cache} to store the data.
    * @param cache A {@link Cache} to store the data.
    * @param upstream A {@link DataSource} for reading data not in the cache.
    * @param upstream A {@link DataSource} for reading data not in the cache.
    * @param counters If not null, updated during caching.
    * @param counters If not null, updated during caching.
+   * @param isCanceled An optional flag that will interrupt caching if set to true.
    * @throws IOException If an error occurs reading from the source.
    * @throws IOException If an error occurs reading from the source.
-   * @throws InterruptedException If the thread was interrupted.
+   * @throws InterruptedException If the thread was interrupted directly or via {@code isCanceled}.
    */
    */
   public static void cache(
   public static void cache(
-      DataSpec dataSpec, Cache cache, DataSource upstream, @Nullable CachingCounters counters)
+      DataSpec dataSpec,
+      Cache cache,
+      DataSource upstream,
+      @Nullable CachingCounters counters,
+      @Nullable AtomicBoolean isCanceled)
       throws IOException, InterruptedException {
       throws IOException, InterruptedException {
-    cache(dataSpec, cache, new CacheDataSource(cache, upstream),
-        new byte[DEFAULT_BUFFER_SIZE_BYTES], null, 0, counters, false);
+    cache(
+        dataSpec,
+        cache,
+        new CacheDataSource(cache, upstream),
+        new byte[DEFAULT_BUFFER_SIZE_BYTES],
+        null,
+        0,
+        counters,
+        null,
+        false);
   }
   }
 
 
   /**
   /**
@@ -140,10 +154,11 @@ public final class CacheUtil {
    *     caching.
    *     caching.
    * @param priority The priority of this task. Used with {@code priorityTaskManager}.
    * @param priority The priority of this task. Used with {@code priorityTaskManager}.
    * @param counters If not null, updated during caching.
    * @param counters If not null, updated during caching.
+   * @param isCanceled An optional flag that will interrupt caching if set to true.
    * @param enableEOFException Whether to throw an {@link EOFException} if end of input has been
    * @param enableEOFException Whether to throw an {@link EOFException} if end of input has been
    *     reached unexpectedly.
    *     reached unexpectedly.
    * @throws IOException If an error occurs reading from the source.
    * @throws IOException If an error occurs reading from the source.
-   * @throws InterruptedException If the thread was interrupted.
+   * @throws InterruptedException If the thread was interrupted directly or via {@code isCanceled}.
    */
    */
   public static void cache(
   public static void cache(
       DataSpec dataSpec,
       DataSpec dataSpec,
@@ -153,6 +168,7 @@ public final class CacheUtil {
       PriorityTaskManager priorityTaskManager,
       PriorityTaskManager priorityTaskManager,
       int priority,
       int priority,
       @Nullable CachingCounters counters,
       @Nullable CachingCounters counters,
+      @Nullable AtomicBoolean isCanceled,
       boolean enableEOFException)
       boolean enableEOFException)
       throws IOException, InterruptedException {
       throws IOException, InterruptedException {
     Assertions.checkNotNull(dataSource);
     Assertions.checkNotNull(dataSource);
@@ -170,6 +186,9 @@ public final class CacheUtil {
     long start = dataSpec.absoluteStreamPosition;
     long start = dataSpec.absoluteStreamPosition;
     long left = dataSpec.length != C.LENGTH_UNSET ? dataSpec.length : cache.getContentLength(key);
     long left = dataSpec.length != C.LENGTH_UNSET ? dataSpec.length : cache.getContentLength(key);
     while (left != 0) {
     while (left != 0) {
+      if (isCanceled != null && isCanceled.get()) {
+        throw new InterruptedException();
+      }
       long blockLength =
       long blockLength =
           cache.getCachedLength(key, start, left != C.LENGTH_UNSET ? left : Long.MAX_VALUE);
           cache.getCachedLength(key, start, left != C.LENGTH_UNSET ? left : Long.MAX_VALUE);
       if (blockLength > 0) {
       if (blockLength > 0) {

library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java

@@ -608,6 +608,11 @@ public class DownloadManagerTest {
     }
     }
 
 
     @Override
     @Override
+    public void cancel() {
+      // Do nothing.
+    }
+
+    @Override
     public void remove() throws InterruptedException {
     public void remove() throws InterruptedException {
       assertThat(isRemoveAction).isTrue();
       assertThat(isRemoveAction).isTrue();
       started.countDown();
       started.countDown();

library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest.java

@@ -220,7 +220,7 @@ public final class CacheDataSourceTest {
                 .newDefaultData()
                 .newDefaultData()
                 .appendReadData(1024 * 1024)
                 .appendReadData(1024 * 1024)
                 .endData());
                 .endData());
-    CacheUtil.cache(dataSpec, cache, upstream2, null);
+    CacheUtil.cache(dataSpec, cache, upstream2, /* counters= */ null, /* isCanceled= */ null);
 
 
     // Read the rest of the data.
     // Read the rest of the data.
     TestUtil.readToEnd(cacheDataSource);
     TestUtil.readToEnd(cacheDataSource);
@@ -271,7 +271,7 @@ public final class CacheDataSourceTest {
                 .newDefaultData()
                 .newDefaultData()
                 .appendReadData(1024 * 1024)
                 .appendReadData(1024 * 1024)
                 .endData());
                 .endData());
-    CacheUtil.cache(dataSpec, cache, upstream2, null);
+    CacheUtil.cache(dataSpec, cache, upstream2, /* counters= */ null, /* isCanceled= */ null);
 
 
     // Read the rest of the data.
     // Read the rest of the data.
     TestUtil.readToEnd(cacheDataSource);
     TestUtil.readToEnd(cacheDataSource);
@@ -287,7 +287,7 @@ public final class CacheDataSourceTest {
 
 
     // Cache the latter half of the data.
     // Cache the latter half of the data.
     DataSpec dataSpec = new DataSpec(testDataUri, 512, C.LENGTH_UNSET, testDataKey);
     DataSpec dataSpec = new DataSpec(testDataUri, 512, C.LENGTH_UNSET, testDataKey);
-    CacheUtil.cache(dataSpec, cache, upstream, null);
+    CacheUtil.cache(dataSpec, cache, upstream, /* counters= */ null, /* isCanceled= */ null);
 
 
     // Create cache read-only CacheDataSource.
     // Create cache read-only CacheDataSource.
     CacheDataSource cacheDataSource =
     CacheDataSource cacheDataSource =
@@ -318,7 +318,7 @@ public final class CacheDataSourceTest {
     // Cache the latter half of the data.
     // Cache the latter half of the data.
     int halfDataLength = 512;
     int halfDataLength = 512;
     DataSpec dataSpec = new DataSpec(testDataUri, halfDataLength, C.LENGTH_UNSET, testDataKey);
     DataSpec dataSpec = new DataSpec(testDataUri, halfDataLength, C.LENGTH_UNSET, testDataKey);
-    CacheUtil.cache(dataSpec, cache, upstream, null);
+    CacheUtil.cache(dataSpec, cache, upstream, /* counters= */ null, /* isCanceled= */ null);
 
 
     // Create blocking CacheDataSource.
     // Create blocking CacheDataSource.
     CacheDataSource cacheDataSource =
     CacheDataSource cacheDataSource =

library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheUtilTest.java

@@ -174,7 +174,8 @@ public final class CacheUtilTest {
     FakeDataSource dataSource = new FakeDataSource(fakeDataSet);
     FakeDataSource dataSource = new FakeDataSource(fakeDataSet);
 
 
     CachingCounters counters = new CachingCounters();
     CachingCounters counters = new CachingCounters();
-    CacheUtil.cache(new DataSpec(Uri.parse("test_data")), cache, dataSource, counters);
+    CacheUtil.cache(
+        new DataSpec(Uri.parse("test_data")), cache, dataSource, counters, /* isCanceled= */ null);
 
 
     assertCounters(counters, 0, 100, 100);
     assertCounters(counters, 0, 100, 100);
     assertCachedData(cache, fakeDataSet);
     assertCachedData(cache, fakeDataSet);
@@ -188,11 +189,11 @@ public final class CacheUtilTest {
     Uri testUri = Uri.parse("test_data");
     Uri testUri = Uri.parse("test_data");
     DataSpec dataSpec = new DataSpec(testUri, 10, 20, null);
     DataSpec dataSpec = new DataSpec(testUri, 10, 20, null);
     CachingCounters counters = new CachingCounters();
     CachingCounters counters = new CachingCounters();
-    CacheUtil.cache(dataSpec, cache, dataSource, counters);
+    CacheUtil.cache(dataSpec, cache, dataSource, counters, /* isCanceled= */ null);
 
 
     assertCounters(counters, 0, 20, 20);
     assertCounters(counters, 0, 20, 20);
 
 
-    CacheUtil.cache(new DataSpec(testUri), cache, dataSource, counters);
+    CacheUtil.cache(new DataSpec(testUri), cache, dataSource, counters, /* isCanceled= */ null);
 
 
     assertCounters(counters, 20, 80, 100);
     assertCounters(counters, 20, 80, 100);
     assertCachedData(cache, fakeDataSet);
     assertCachedData(cache, fakeDataSet);
@@ -207,7 +208,7 @@ public final class CacheUtilTest {
 
 
     DataSpec dataSpec = new DataSpec(Uri.parse("test_data"));
     DataSpec dataSpec = new DataSpec(Uri.parse("test_data"));
     CachingCounters counters = new CachingCounters();
     CachingCounters counters = new CachingCounters();
-    CacheUtil.cache(dataSpec, cache, dataSource, counters);
+    CacheUtil.cache(dataSpec, cache, dataSource, counters, /* isCanceled= */ null);
 
 
     assertCounters(counters, 0, 100, 100);
     assertCounters(counters, 0, 100, 100);
     assertCachedData(cache, fakeDataSet);
     assertCachedData(cache, fakeDataSet);
@@ -223,11 +224,11 @@ public final class CacheUtilTest {
     Uri testUri = Uri.parse("test_data");
     Uri testUri = Uri.parse("test_data");
     DataSpec dataSpec = new DataSpec(testUri, 10, 20, null);
     DataSpec dataSpec = new DataSpec(testUri, 10, 20, null);
     CachingCounters counters = new CachingCounters();
     CachingCounters counters = new CachingCounters();
-    CacheUtil.cache(dataSpec, cache, dataSource, counters);
+    CacheUtil.cache(dataSpec, cache, dataSource, counters, /* isCanceled= */ null);
 
 
     assertCounters(counters, 0, 20, 20);
     assertCounters(counters, 0, 20, 20);
 
 
-    CacheUtil.cache(new DataSpec(testUri), cache, dataSource, counters);
+    CacheUtil.cache(new DataSpec(testUri), cache, dataSource, counters, /* isCanceled= */ null);
 
 
     assertCounters(counters, 20, 80, 100);
     assertCounters(counters, 20, 80, 100);
     assertCachedData(cache, fakeDataSet);
     assertCachedData(cache, fakeDataSet);
@@ -241,7 +242,7 @@ public final class CacheUtilTest {
     Uri testUri = Uri.parse("test_data");
     Uri testUri = Uri.parse("test_data");
     DataSpec dataSpec = new DataSpec(testUri, 0, 1000, null);
     DataSpec dataSpec = new DataSpec(testUri, 0, 1000, null);
     CachingCounters counters = new CachingCounters();
     CachingCounters counters = new CachingCounters();
-    CacheUtil.cache(dataSpec, cache, dataSource, counters);
+    CacheUtil.cache(dataSpec, cache, dataSource, counters, /* isCanceled= */ null);
 
 
     assertCounters(counters, 0, 100, 1000);
     assertCounters(counters, 0, 100, 1000);
     assertCachedData(cache, fakeDataSet);
     assertCachedData(cache, fakeDataSet);
@@ -256,9 +257,16 @@ public final class CacheUtilTest {
     DataSpec dataSpec = new DataSpec(testUri, 0, 1000, null);
     DataSpec dataSpec = new DataSpec(testUri, 0, 1000, null);
 
 
     try {
     try {
-      CacheUtil.cache(dataSpec, cache, new CacheDataSource(cache, dataSource),
-          new byte[CacheUtil.DEFAULT_BUFFER_SIZE_BYTES], null, 0, null,
-          /*enableEOFException*/ true);
+      CacheUtil.cache(
+          dataSpec,
+          cache,
+          new CacheDataSource(cache, dataSource),
+          new byte[CacheUtil.DEFAULT_BUFFER_SIZE_BYTES],
+          /* priorityTaskManager= */ null,
+          /* priority= */ 0,
+          /* counters= */ null,
+          /* isCanceled= */ null,
+          /* enableEOFException= */ true);
       fail();
       fail();
     } catch (EOFException e) {
     } catch (EOFException e) {
       // Do nothing.
       // Do nothing.
@@ -286,7 +294,8 @@ public final class CacheUtilTest {
         .appendReadData(TestUtil.buildTestData(100)).endData();
         .appendReadData(TestUtil.buildTestData(100)).endData();
     FakeDataSource dataSource = new FakeDataSource(fakeDataSet);
     FakeDataSource dataSource = new FakeDataSource(fakeDataSet);
 
 
-    CacheUtil.cache(new DataSpec(Uri.parse("test_data")), cache, dataSource, counters);
+    CacheUtil.cache(
+        new DataSpec(Uri.parse("test_data")), cache, dataSource, counters, /* isCanceled= */ null);
 
 
     assertCounters(counters, 0, 300, 300);
     assertCounters(counters, 0, 300, 300);
     assertCachedData(cache, fakeDataSet);
     assertCachedData(cache, fakeDataSet);
@@ -298,10 +307,17 @@ public final class CacheUtilTest {
     FakeDataSource dataSource = new FakeDataSource(fakeDataSet);
     FakeDataSource dataSource = new FakeDataSource(fakeDataSet);
 
 
     Uri uri = Uri.parse("test_data");
     Uri uri = Uri.parse("test_data");
-    CacheUtil.cache(new DataSpec(uri), cache,
+    CacheUtil.cache(
+        new DataSpec(uri),
+        cache,
         // set maxCacheFileSize to 10 to make sure there are multiple spans
         // set maxCacheFileSize to 10 to make sure there are multiple spans
         new CacheDataSource(cache, dataSource, 0, 10),
         new CacheDataSource(cache, dataSource, 0, 10),
-        new byte[CacheUtil.DEFAULT_BUFFER_SIZE_BYTES], null, 0, null, true);
+        new byte[CacheUtil.DEFAULT_BUFFER_SIZE_BYTES],
+        /* priorityTaskManager= */ null,
+        /* priority= */ 0,
+        /* counters= */ null,
+        /* isCanceled= */ null,
+        true);
     CacheUtil.remove(cache, CacheUtil.generateKey(uri));
     CacheUtil.remove(cache, CacheUtil.generateKey(uri));
 
 
     assertCacheEmpty(cache);
     assertCacheEmpty(cache);