Revert pushing download thread interruption into the Downloader imple…

…mentations Issue: #5978 PiperOrigin-RevId: 314175257
google · Jun 2, 2020 · 2f3c7cb · 2f3c7cb
1 parent 8b89a5e
commit 2f3c7cb
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 23 deletions.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -1284,6 +1284,7 @@ public void cancel(boolean released) {
       if (!isCanceled) {
         isCanceled = true;
         downloader.cancel();
+        interrupt();
       }
     }
 

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/Downloader.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/Downloader.java
@@ -50,7 +50,10 @@ interface ProgressListener {
    */
   void download(@Nullable ProgressListener progressListener) throws IOException;
 
-  /** Cancels the download operation and prevents future download operations from running. */
+  /**
+   * Cancels the download operation and prevents future download operations from running. The caller
+   * should also interrupt the downloading thread immediately after calling this method.
+   */
   void cancel();
 
   /** Removes the content. */

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloader.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloader.java
@@ -22,7 +22,6 @@
 import com.google.android.exoplayer2.upstream.DataSpec;
 import com.google.android.exoplayer2.upstream.cache.CacheDataSource;
 import com.google.android.exoplayer2.upstream.cache.CacheWriter;
-import com.google.android.exoplayer2.upstream.cache.CacheWriter.ProgressListener;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.PriorityTaskManager;
 import com.google.android.exoplayer2.util.PriorityTaskManager.PriorityTooLowException;
@@ -37,8 +36,6 @@ public final class ProgressiveDownloader implements Downloader {
   private final CacheDataSource dataSource;
   private final AtomicBoolean isCanceled;
 
-  @Nullable private volatile Thread downloadThread;
-
   /** @deprecated Use {@link #ProgressiveDownloader(MediaItem, CacheDataSource.Factory)} instead. */
   @SuppressWarnings("deprecation")
   @Deprecated
@@ -100,11 +97,6 @@ public ProgressiveDownloader(
 
   @Override
   public void download(@Nullable ProgressListener progressListener) throws IOException {
-    downloadThread = Thread.currentThread();
-    if (isCanceled.get()) {
-      return;
-    }
-
     CacheWriter cacheWriter =
         new CacheWriter(
             dataSource,
@@ -143,10 +135,6 @@ public void download(@Nullable ProgressListener progressListener) throws IOExcep
   @Override
   public void cancel() {
     isCanceled.set(true);
-    @Nullable Thread downloadThread = this.downloadThread;
-    if (downloadThread != null) {
-      downloadThread.interrupt();
-    }
   }
 
   @Override

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/SegmentDownloader.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/SegmentDownloader.java
@@ -80,8 +80,6 @@ public int compareTo(Segment other) {
   private final Executor executor;
   private final AtomicBoolean isCanceled;
 
-  @Nullable private volatile Thread downloadThread;
-
   /**
    * @param mediaItem The {@link MediaItem} to be downloaded.
    * @param manifestParser A parser for the manifest.
@@ -107,10 +105,6 @@ public SegmentDownloader(
 
   @Override
   public final void download(@Nullable ProgressListener progressListener) throws IOException {
-    downloadThread = Thread.currentThread();
-    if (isCanceled.get()) {
-      return;
-    }
     @Nullable
     PriorityTaskManager priorityTaskManager =
         cacheDataSourceFactory.getUpstreamPriorityTaskManager();
@@ -212,10 +206,6 @@ public final void download(@Nullable ProgressListener progressListener) throws I
   @Override
   public void cancel() {
     isCanceled.set(true);
-    @Nullable Thread downloadThread = this.downloadThread;
-    if (downloadThread != null) {
-      downloadThread.interrupt();
-    }
   }
 
   @Override