From 2a9144fa569bc58831d2e0e448e3ca07c4b6c579 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Wed, 10 Jun 2020 11:04:51 +0100
Subject: [PATCH] Fix loadCompleted flag in MediaChunk implementations.

This flag was always set even if the load was canceled and not completed.

PiperOrigin-RevId: 315659262
---
 .../android/exoplayer2/source/chunk/ContainerMediaChunk.java    | 2 +-
 .../com/google/android/exoplayer2/source/hls/HlsMediaChunk.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ContainerMediaChunk.java b/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ContainerMediaChunk.java
index d0daaf0839..57e5687337 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ContainerMediaChunk.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ContainerMediaChunk.java
@@ -138,7 +138,7 @@ public class ContainerMediaChunk extends BaseMediaChunk {
     } finally {
       Util.closeQuietly(dataSource);
     }
-    loadCompleted = true;
+    loadCompleted = !loadCanceled;
   }
 
   /**
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java
index 85f30986ef..4e87e717bf 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java
@@ -349,7 +349,7 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
       if (!hasGapTag) {
         loadMedia();
       }
-      loadCompleted = true;
+      loadCompleted = !loadCanceled;
     }
   }