Notify span listeners even if index store fails in SimpleCache.removeSpan

This fixes infinite loop in LeastRecentlyUsedCacheEvictor.evictCache when index store fails.

Also made CachedContentIndex not final so it can be mocked and added a package protected SimpleCache
constructor so mock index can be injected.

Issue: #3260

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

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

@@ -49,7 +49,7 @@ import javax.crypto.spec.SecretKeySpec;
 /**
 /**
  * This class maintains the index of cached content.
  * This class maintains the index of cached content.
  */
  */
-/*package*/ final class CachedContentIndex {
+/*package*/ class CachedContentIndex {
 
 
   public static final String FILE_NAME = "cached_content_index.exi";
   public static final String FILE_NAME = "cached_content_index.exi";
 
 

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

@@ -48,7 +48,7 @@ public final class SimpleCache implements Cache {
    * @param evictor The evictor to be used.
    * @param evictor The evictor to be used.
    */
    */
   public SimpleCache(File cacheDir, CacheEvictor evictor) {
   public SimpleCache(File cacheDir, CacheEvictor evictor) {
-    this(cacheDir, evictor, null);
+    this(cacheDir, evictor, null, false);
   }
   }
 
 
   /**
   /**
@@ -75,10 +75,22 @@ public final class SimpleCache implements Cache {
    * @param encrypt When false, a plaintext index will be written.
    * @param encrypt When false, a plaintext index will be written.
    */
    */
   public SimpleCache(File cacheDir, CacheEvictor evictor, byte[] secretKey, boolean encrypt) {
   public SimpleCache(File cacheDir, CacheEvictor evictor, byte[] secretKey, boolean encrypt) {
+    this(cacheDir, evictor, new CachedContentIndex(cacheDir, secretKey, encrypt));
+  }
+
+  /**
+   * Constructs the cache. The cache will delete any unrecognized files from the directory. Hence
+   * the directory cannot be used to store other files.
+   *
+   * @param cacheDir A dedicated cache directory.
+   * @param evictor The evictor to be used.
+   * @param index The CachedContentIndex to be used.
+   */
+  /*package*/ SimpleCache(File cacheDir, CacheEvictor evictor, CachedContentIndex index) {
     this.cacheDir = cacheDir;
     this.cacheDir = cacheDir;
     this.evictor = evictor;
     this.evictor = evictor;
     this.lockedSpans = new HashMap<>();
     this.lockedSpans = new HashMap<>();
-    this.index = new CachedContentIndex(cacheDir, secretKey, encrypt);
+    this.index = index;
     this.listeners = new HashMap<>();
     this.listeners = new HashMap<>();
     // Start cache initialization.
     // Start cache initialization.
     final ConditionVariable conditionVariable = new ConditionVariable();
     final ConditionVariable conditionVariable = new ConditionVariable();
@@ -305,12 +317,15 @@ public final class SimpleCache implements Cache {
       return;
       return;
     }
     }
     totalSpace -= span.length;
     totalSpace -= span.length;
+    try {
       if (removeEmptyCachedContent && cachedContent.isEmpty()) {
       if (removeEmptyCachedContent && cachedContent.isEmpty()) {
         index.removeEmpty(cachedContent.key);
         index.removeEmpty(cachedContent.key);
         index.store();
         index.store();
       }
       }
+    } finally {
       notifySpanRemoved(span);
       notifySpanRemoved(span);
     }
     }
+  }
 
 
   @Override
   @Override
   public synchronized void removeSpan(CacheSpan span) throws CacheException {
   public synchronized void removeSpan(CacheSpan span) throws CacheException {