From 51132f58f9e08cd247a9d2f7149c860037cdb590 Mon Sep 17 00:00:00 2001
From: tasnimsunny <tasnimsunny@google.com>
Date: Mon, 8 May 2017 12:46:09 -0700
Subject: [PATCH] Make removal of non-existent cache span a no-op

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=155413733
---
 .../google/android/exoplayer2/upstream/cache/SimpleCache.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
index 14f006c8500..bbff7dc4a28 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
@@ -286,7 +286,9 @@ private void addSpan(SimpleCacheSpan span) {
 
   private void removeSpan(CacheSpan span, boolean removeEmptyCachedContent) throws CacheException {
     CachedContent cachedContent = index.get(span.key);
-    Assertions.checkState(cachedContent.removeSpan(span));
+    if (cachedContent == null || !cachedContent.removeSpan(span)) {
+      return;
+    }
     totalSpace -= span.length;
     if (removeEmptyCachedContent && cachedContent.isEmpty()) {
       index.removeEmpty(cachedContent.key);