Fix leftover bytes in cached content index file

Extra calls to CipherOutputStream.close() causes each time extra 16 bytes written to the
underlying OutputStream. Prevented close() is called more than once and also discarded any
data in ReusableBufferedOutputStream buffer on reset().

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

library/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndexTest.java

@@ -181,7 +181,7 @@ public class CachedContentIndexTest extends InstrumentationTestCase {
     // Assert file content is different
     // Assert file content is different
     FileInputStream fis1 = new FileInputStream(file1);
     FileInputStream fis1 = new FileInputStream(file1);
     FileInputStream fis2 = new FileInputStream(file2);
     FileInputStream fis2 = new FileInputStream(file2);
-    for (int b; (b = fis1.read()) == fis2.read();) {
+    for (int b; (b = fis1.read()) == fis2.read(); ) {
       assertTrue(b != -1);
       assertTrue(b != -1);
     }
     }
 
 
@@ -205,6 +205,12 @@ public class CachedContentIndexTest extends InstrumentationTestCase {
     // Non encrypted index file can be read even when encryption key provided.
     // Non encrypted index file can be read even when encryption key provided.
     assertStoredAndLoadedEqual(new CachedContentIndex(cacheDir),
     assertStoredAndLoadedEqual(new CachedContentIndex(cacheDir),
         new CachedContentIndex(cacheDir, key));
         new CachedContentIndex(cacheDir, key));
+
+    // Test multiple store() calls
+    CachedContentIndex index = new CachedContentIndex(cacheDir, key);
+    index.addNew(new CachedContent(15, "key3", 110));
+    index.store();
+    assertStoredAndLoadedEqual(index, new CachedContentIndex(cacheDir, key));
   }
   }
 
 
   private void assertStoredAndLoadedEqual(CachedContentIndex index, CachedContentIndex index2)
   private void assertStoredAndLoadedEqual(CachedContentIndex index, CachedContentIndex index2)

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

@@ -302,6 +302,9 @@ import javax.crypto.spec.SecretKeySpec;
       }
       }
       output.writeInt(hashCode);
       output.writeInt(hashCode);
       atomicFile.endWrite(output);
       atomicFile.endWrite(output);
+      // Avoid calling close twice. Duplicate CipherOutputStream.close calls did
+      // not used to be no-ops: https://android-review.googlesource.com/#/c/272799/
+      output = null;
     } catch (IOException e) {
     } catch (IOException e) {
       throw new CacheException(e);
       throw new CacheException(e);
     } finally {
     } finally {

library/src/main/java/com/google/android/exoplayer2/util/ReusableBufferedOutputStream.java

@@ -67,6 +67,7 @@ public final class ReusableBufferedOutputStream extends BufferedOutputStream {
   public void reset(OutputStream out) {
   public void reset(OutputStream out) {
     Assertions.checkState(closed);
     Assertions.checkState(closed);
     this.out = out;
     this.out = out;
+    count = 0;
     closed = false;
     closed = false;
   }
   }
 }
 }