loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-05-03 21:57:46 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Automated g4 rollback of changelist 191834511.

Browse Source 
*** Reason for rollback ***

Rolling back to re-disable the exception as the crash is still appearing on latest version

*** Original change description ***

Automated g4 rollback of changelist 191128111.

*** Reason for rollback ***

This was a temp fix to be cherrypicked into YouTube Andorid Main App 13.12  to resolve P0 b/77315136.

*** Original change description ***

Temp fix for b/77315136: Don't lock or check cache directories in SimpleCache

To be immediately rolled back after submission

Submitting on behalf of cblay.

***

***

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=192789263
This commit is contained in:
vyao 2018-04-13 10:38:09 -07:00 committed by Oliver Woodman
parent 0b0868889e
commit ebc1b2d2cc
2 changed files with 11 additions and 15 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,10 +93,6 @@ public final class SimpleCache implements Cache {
* @param index The CachedContentIndex to be used. * @param index The CachedContentIndex to be used.
*/ */
/*package*/ SimpleCache(File cacheDir, CacheEvictor evictor, CachedContentIndex index) { /*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.cacheDir = cacheDir;
this.evictor = evictor; this.evictor = evictor;
this.index = index; 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 // @Test
public void testMultipleSimpleCacheWithSameCacheDirThrowsException() throws Exception { // public void testMultipleSimpleCacheWithSameCacheDirThrowsException() throws Exception {
new SimpleCache(cacheDir, new NoOpCacheEvictor()); // new SimpleCache(cacheDir, new NoOpCacheEvictor());
//
try { // try {
new SimpleCache(cacheDir, new NoOpCacheEvictor()); // new SimpleCache(cacheDir, new NoOpCacheEvictor());
assertWithMessage("Exception was expected").fail(); // assertWithMessage("Exception was expected").fail();
} catch (IllegalStateException e) { // } catch (IllegalStateException e) {
// Expected. Do nothing. // // Expected. Do nothing.
} // }
} // }
@Test @Test
public void testMultipleSimpleCacheWithSameCacheDirDoesNotThrowsExceptionAfterRelease() public void testMultipleSimpleCacheWithSameCacheDirDoesNotThrowsExceptionAfterRelease()