loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-05-11 17:49:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Automated g4 rollback of changelist 191128111.

Browse Source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=191834511
This commit is contained in:
danarapagna 2018-04-05 19:12:58 -07:00 committed by Oliver Woodman
parent 26cb32ab6a
commit 8a74acbe6f
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java vendored
View File

@ -93,6 +93,10 @@ public final class SimpleCache implements Cache {
* @param index The CachedContentIndex to be used.
*/
/*package*/ SimpleCache(File cacheDir, CacheEvictor evictor, CachedContentIndex index) {
if (!lockFolder(cacheDir)) {
throw new IllegalStateException("Another SimpleCache instance uses the folder: " + cacheDir);
}
this.cacheDir = cacheDir;
this.evictor = evictor;
this.index = index;

22
library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheTest.java vendored
View File

@ -296,17 +296,17 @@ public class SimpleCacheTest {
}
}
// @Test
// public void testMultipleSimpleCacheWithSameCacheDirThrowsException() throws Exception {
// new SimpleCache(cacheDir, new NoOpCacheEvictor());
//
// try {
// new SimpleCache(cacheDir, new NoOpCacheEvictor());
// assertWithMessage("Exception was expected").fail();
// } catch (IllegalStateException e) {
// // Expected. Do nothing.
// }
// }
@Test
public void testMultipleSimpleCacheWithSameCacheDirThrowsException() throws Exception {
new SimpleCache(cacheDir, new NoOpCacheEvictor());
try {
new SimpleCache(cacheDir, new NoOpCacheEvictor());
assertWithMessage("Exception was expected").fail();
} catch (IllegalStateException e) {
// Expected. Do nothing.
}
}
@Test
public void testMultipleSimpleCacheWithSameCacheDirDoesNotThrowsExceptionAfterRelease()